used new m2e format / used diamond operator where appropriate

git-svn-id: file:///home/svnroot-zephyrsoft/projects/sdb2/trunk@520 f37aa4ac-6963-46a2-a1ff-558a307fa857