merge of 'b82d34d538132713ba10d59d0209f562e276f44b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 14 Jul 2008 16:54:19 +0000 (16:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 14 Jul 2008 16:54:19 +0000 (16:54 +0000)
     and 'fa252fa4613643090cf4875e44edac9246d3fcd0'


Trivial merge