merge of '29f34b6c27e10d81f001d11a5e9ab29d1e915ffd'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 11:14:02 +0000 (11:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 11:14:02 +0000 (11:14 +0000)
     and 'e1bf125b596e0dbb381f6cc4ea272fcd16c78199'


Trivial merge