merge of '069961becc44a86c25703ae2d26de30fba398c72'
authorKoen Kooi <koen@openembedded.org>
Wed, 5 Mar 2008 15:34:09 +0000 (15:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 5 Mar 2008 15:34:09 +0000 (15:34 +0000)
     and 'e9838ae7ae6df69bb3ed71e9decb1b41fe4f6050'


Trivial merge