merge of '8609dfe0ecad86d5c032ff47c7257165507c47fe'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 13:48:24 +0000 (13:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 13:48:24 +0000 (13:48 +0000)
     and 'fb60e809e63aacb52c9c7bf0dd942e3b8c998d16'


Trivial merge