merge of '283054912f3356d2c4ff5789698b6e711bf35c43'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 12:58:10 +0000 (12:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 12:58:10 +0000 (12:58 +0000)
     and 'd8895e78d633e44885169498f3566ac510d55c97'


Trivial merge