merge of '0605804319cd93683b89d41fc3fa77a06a21e0af'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 19:39:33 +0000 (19:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 19:39:33 +0000 (19:39 +0000)
     and 'baa20636fd4d4cb1c0b3dbeb154bbab5f11d5443'


Trivial merge