merge of '300063bb2f3d1abb7a7532b48c45894ec6098d31'
authorKoen Kooi <koen@openembedded.org>
Tue, 26 Sep 2006 13:47:00 +0000 (13:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 26 Sep 2006 13:47:00 +0000 (13:47 +0000)
     and '60a1e8380dd7fc43fb994db1a4b4071e1a95b60b'


Trivial merge