merge of '92b50128e188e5fefd038726a401a9de2dd1ef56'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 19:03:24 +0000 (19:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 19:03:24 +0000 (19:03 +0000)
commit441b003b709a729111f1d9a07c87542b69c05fa6
treec9f51f656f1612ca22a8c2e356296ba07ad121cf
parentd244d3d2920a8c04f79824c8ff3bbab43b3ed1b8
parent31d9daecb87278b825f29ca475df8b622cf3c812
Merge ... '92b50128e188e5fefd038726a401a9de2dd1ef56'
     and 'ca639ce6da41e90a150a4efd5a0738273cd10607'