merge of '0f44bcd26a6185d450f29b4b451eaaadda3bcb9b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 21:22:56 +0000 (21:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 21:22:56 +0000 (21:22 +0000)
     and 'bbd07d21e3c8b5f15d0aceedafa156de21e24e67'


Trivial merge