merge of 'e0f576aebb5cfb2314d6b462c4903057ea1aceb3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 14:50:46 +0000 (14:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 14:50:46 +0000 (14:50 +0000)
     and 'f0ec62cadbae3343a8a86690d39fcf38edf159d9'


Trivial merge