merge of '937e098c88f41af274b6cb04f049439e168d15b9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 Jan 2008 14:46:13 +0000 (14:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 Jan 2008 14:46:13 +0000 (14:46 +0000)
     and 'e4319c22e09affdcdc5fbec3afd685b355fb8e14'


Trivial merge