merge of 'a508f81666c33ba6d5e81ff7c43d50db0bf8dcf0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 12:05:14 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 12:05:14 +0000 (12:05 +0000)
     and 'c25b1259829aa217ebc230cc360b8fffca4cf743'


Trivial merge