merge of '42f626957035d9fc4496080e90c92e06f8a2070e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Dec 2007 21:50:13 +0000 (21:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Dec 2007 21:50:13 +0000 (21:50 +0000)
     and 'b1610df18b4d8070f056d9621c7826cf30b62bca'


Trivial merge