merge of '3f94d65dac6aa5231048ff3e534da903ee56b856'
authorKoen Kooi <koen@openembedded.org>
Tue, 9 Sep 2008 13:15:32 +0000 (13:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 9 Sep 2008 13:15:32 +0000 (13:15 +0000)
     and 'e1eb2ac7cd166c46d35294a5f5902e7325e8a8c9'


Trivial merge