merge of 'b7a7a521880ca0846912622d5ca7f1550400f306'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 10:53:45 +0000 (10:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 10:53:45 +0000 (10:53 +0000)
     and 'f6ee78534548636d8f9b3a7c033fe73faf8f5538'


Trivial merge