merge of '82245638ef37f8730477752665cc0965a7c2556c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 00:33:07 +0000 (00:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 00:33:07 +0000 (00:33 +0000)
     and 'ab470e95662adb7ab2cc12e234b243e2281bde06'


Trivial merge