merge of 'a9808e56bd5ba300061fa4d69888598275bd7f8b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Dec 2007 03:18:19 +0000 (03:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Dec 2007 03:18:19 +0000 (03:18 +0000)
     and 'ddcc413146b226215e5f652d2c152bab4758f36d'


Trivial merge