merge of '2bfc7617553093cf49cd0c4c7e294436a43b2bee'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 13:04:11 +0000 (13:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 13:04:11 +0000 (13:04 +0000)
     and '5cf78fdb2dc10cb020c2a329af096264e3c0f224'


Trivial merge