merge of '5da7cf9aa3826def2c6dd499a01135180d7d6920'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Dec 2007 00:17:11 +0000 (00:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Dec 2007 00:17:11 +0000 (00:17 +0000)
     and 'c2229d2baf9f3a015f0aa6354d84590f73a5ca0a'


Trivial merge