merge of '9bacfdd26bdeaacd4a971d85fd05e2db9d7a3018'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jun 2008 12:05:12 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jun 2008 12:05:12 +0000 (12:05 +0000)
     and 'f09c276e8987c4e22f71952b3b817240241941a3'


Trivial merge