merge of '37cd5a414f2408369f6ae26d79cd5e331c29920b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 19:55:17 +0000 (19:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 19:55:17 +0000 (19:55 +0000)
commit1a024cff0ce1d516c47f70bea1ebe3ec02e82541
tree586fcfe65f9eeb921a5119ce0d071b4ebabdcd40
parentc9f6c8a89dbbfd4178d8c097f4f91a344e71d6f0
parent16860b8f72607a869c470816ea6f94c22893a531
Merge ... '37cd5a414f2408369f6ae26d79cd5e331c29920b'
     and 'fbdf3fdc31b4f3390910821902b9b5c0b3a28dc0'