merge of '7bc0867c76d85a5f85fa0d7a9f66dfd4d9c499bb'
authorKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 23:12:01 +0000 (23:12 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 23:12:01 +0000 (23:12 +0000)
     and 'c8821bce45c12f64b0b533cda3bbe41267c804d5'


Trivial merge