merge of 'b6faf2a6dc98242794af36b6508ba20768cf5c33'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 12:04:53 +0000 (12:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 12:04:53 +0000 (12:04 +0000)
     and 'd0704c3a8d828eb2cff883ccdb195cd29eb07488'


Trivial merge