merge of '118a617db4118b3a38a8228d498c7dc59d711702'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 00:21:03 +0000 (00:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 00:21:03 +0000 (00:21 +0000)
     and '2bf1435f45f314c6cf35f23ccdd55ab9ed8a1032'


Trivial merge