merge of '0c96c7b5c31b29dbfc8df2a2ec577addd4bb9461'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 21:04:34 +0000 (21:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 21:04:34 +0000 (21:04 +0000)
     and '6b8c5dfa1242c770d1d6c3f4939f19e2d8ea800d'


Trivial merge