merge of '06df0f40b1d36f22a5e9a1ddc32dbed08ea25373'
authorKoen Kooi <koen@openembedded.org>
Sat, 20 Sep 2008 11:54:00 +0000 (11:54 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 20 Sep 2008 11:54:00 +0000 (11:54 +0000)
     and '549d74d276248489dc6922e55359e9b25d94f07c'


Trivial merge