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)
     and 'fbdf3fdc31b4f3390910821902b9b5c0b3a28dc0'


Trivial merge