merge of '04e7fd23b654ca78723da82bfeaf289b3d013aae'
authorKoen Kooi <koen@openembedded.org>
Wed, 26 Jul 2006 16:05:19 +0000 (16:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 26 Jul 2006 16:05:19 +0000 (16:05 +0000)
     and '8799855818ba7f133d8510597a9131212edb14a8'


Trivial merge