merge of '79771edb5b4d45a18e509f01db9c473d1aa63962'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 16:17:12 +0000 (16:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 16:17:12 +0000 (16:17 +0000)
     and '835bda37b996295e3fb4a19b2f3d71f25cd0abca'


Trivial merge