merge of '80c52e76bb10a5094aed318ae2fdb1dd54142fa6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Feb 2008 16:19:50 +0000 (16:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Feb 2008 16:19:50 +0000 (16:19 +0000)
     and 'eb3456028de695d23262b2922803a1c67199d914'


Trivial merge