merge of '6fa9ef4e1d87a14ef1a17903570daeb24f495240'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 12:50:42 +0000 (12:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 12:50:42 +0000 (12:50 +0000)
     and 'af90841f4497299774d1cfae17dd753a99956544'


Trivial merge