+Merged trunk into the OCIL20 branch.
+Kept new schema, added my changes, re-scomped with java 1.6_29
Authored by: danmitch 2011-12-21
Parent: [r1060]
Child: [r1062]