merge of '27361f2a0b1eebdce6a9d0830236764c47824c0d'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 10:02:38 +0000 (10:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 10:02:38 +0000 (10:02 +0000)
     and '8b14b75b01474b46308d68ecc3bc79cdde6a3ab9'


Trivial merge