merge of '1bf5b0badb102f7bb3da330b7e7a24077d2dd3b2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 14 Apr 2008 13:44:40 +0000 (13:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 14 Apr 2008 13:44:40 +0000 (13:44 +0000)
     and 'bfd97eeef754278ceda2ed7f140fb611e080e1f7'


Trivial merge