merge of '418c8f8721711c31d603902018e139a4834946ca'
authorKoen Kooi <koen@openembedded.org>
Sun, 5 Nov 2006 21:34:27 +0000 (21:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 5 Nov 2006 21:34:27 +0000 (21:34 +0000)
     and 'f4f260a7113d446b401c939f0bba03f887e2d69b'


Trivial merge