merge of '2b87c80fce42b1cb1d444242944beb67eda5a222'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Jul 2008 13:58:07 +0000 (13:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Jul 2008 13:58:07 +0000 (13:58 +0000)
     and 'bf12ea84196b8d5bca8a71dcd1206b34e2bebcb1'


Trivial merge