merge of '452a82218384d46f3ac39581fe8409623ec425a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 8 Feb 2008 01:24:27 +0000 (01:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 8 Feb 2008 01:24:27 +0000 (01:24 +0000)
     and '63e1c5b96606f5261e825fbcd0022b3c5961a1a9'


Trivial merge