merge of '30e6927f64df64a690f6fa71e96e620cbf201274'
authorKoen Kooi <koen@openembedded.org>
Wed, 6 Jun 2007 15:12:59 +0000 (15:12 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 6 Jun 2007 15:12:59 +0000 (15:12 +0000)
     and 'e6bd0dc9230ea6acdcf964b4cbbe2d204eb2a5c6'


Trivial merge