merge of '0b047574c2795c0058db53e754d56c77c8df3c70'
authorKoen Kooi <koen@openembedded.org>
Sun, 21 Sep 2008 15:29:50 +0000 (15:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 21 Sep 2008 15:29:50 +0000 (15:29 +0000)
     and '1e290b7acda884903f32c7adb3068923cae172fd'


Trivial merge