merge of '090d29830a5f223586361b1541b1a3b28b8e4997'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 19:34:59 +0000 (19:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 19:34:59 +0000 (19:34 +0000)
     and 'bd52cfc69a4e0959191eccd3b5f851c64dc9e0d0'


Trivial merge