merge of '3f551b06dbb61a62224fe6d9f3affb063932e0f1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Sep 2008 19:01:26 +0000 (19:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Sep 2008 19:01:26 +0000 (19:01 +0000)
     and 'b06c292fe0a6222355b7b5337759a187eafa372b'


Trivial merge