merge of '0d8bbbcdb6668a128380d44dac827d05c8e25266'
authorKoen Kooi <koen@openembedded.org>
Thu, 7 Feb 2008 11:29:05 +0000 (11:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 7 Feb 2008 11:29:05 +0000 (11:29 +0000)
     and '56d99745e997218245cc7d9ec59717796070a9d6'


Trivial merge