merge of '218274d3d618ee5de9be9d8d43abfc279f552139'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jun 2008 16:34:56 +0000 (16:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jun 2008 16:34:56 +0000 (16:34 +0000)
     and '8eb2a350085e36627bc9a432834ecae61c94ac82'


Trivial merge