merge of '777103e5b5aa7d64334c2a82ce75fa5e033379db'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 00:25:41 +0000 (00:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 00:25:41 +0000 (00:25 +0000)
     and 'f70cc54fbf41943e412d1aaa62dc0abbc1d3358a'


Trivial merge