merge of '39f14a7904df78c33a10ff78c5b16684b63bf4ca'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Oct 2007 20:35:04 +0000 (20:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Oct 2007 20:35:04 +0000 (20:35 +0000)
     and 'ff99dd15b2922519885cf8632ba157d543e933c2'


Trivial merge