Merge 'trunk' into 'Moose-dumb_roles'
Yuval Kogman [Wed, 2 Aug 2006 14:34:35 +0000 (14:34 +0000)]
r34034@syeeda (orig r1743):  stevan | 2006-07-16 04:24:48 +0300
adding the roadmap
r34035@syeeda (orig r1744):  stevan | 2006-07-16 22:49:37 +0300
run-time role composition test (failing)
r34039@syeeda (orig r1748):  stevan | 2006-07-21 18:03:45 +0300
recipe 5
r34040@syeeda (orig r1749):  stevan | 2006-07-24 17:35:25 +0300
ChangeLog


Trivial merge