merge of '2a8702db4281b5dc1be59182ca755ae0bac6b5fa'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Aug 2008 13:56:24 +0000 (13:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Aug 2008 13:56:24 +0000 (13:56 +0000)
     and 'c7d0711a18c512a5aa6f7085793a18d0849cf9d2'


Trivial merge