merge of 'aa2c7cca9146ef3910ca2f5ea908bc240fc478f9'
authorKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 15:39:35 +0000 (15:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 15:39:35 +0000 (15:39 +0000)
     and 'b866b8272d34e10f3efd115e1dbb79b5287031e9'


Trivial merge