merge of '03be01b188343deda5a2013298d805f52b70faf0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 05:18:07 +0000 (05:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 05:18:07 +0000 (05:18 +0000)
     and 'b80d9ebb857751a743351b4d94c9d52aadf9785b'


Trivial merge