merge of '01e31e6ccd75ddf643280f27490975f2e499a82a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 20:28:00 +0000 (20:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 20:28:00 +0000 (20:28 +0000)
     and 'dcf02285d808869be79389e20e77afe25dfb8734'


Trivial merge