merge of 'bd3711fbb9c0d355dbbef7978d07125ff2b635f5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Feb 2008 00:40:23 +0000 (00:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Feb 2008 00:40:23 +0000 (00:40 +0000)
     and 'c2ee59d447a958de79c86638383bdd570aea81c7'


Trivial merge