key:value notation for composites
key:value notation for composites

R=rsc
DELTA=106  (69 added, 9 deleted, 28 changed)
OCL=29203
CL=29254
abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go