merge of '0f6914ddb71c4af09ef7eaffe37c3c74c50c60b7'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 13:41:39 +0000 (13:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 13:41:39 +0000 (13:41 +0000)
     and '824441f3a8e403dd32a1171069630d10f7b8d4d1'


Trivial merge