merge of '1deac361ca5b23f9321f50e6bb4143327fefbdd7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Oct 2007 11:14:04 +0000 (11:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Oct 2007 11:14:04 +0000 (11:14 +0000)
     and 'ac8a5e02cb4b87019cb729953ff361387cf30945'


Trivial merge