merge of '7123aeb50a120a6a5370c2a906821b0d823accb7'
authorKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 19:11:23 +0000 (19:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 19:11:23 +0000 (19:11 +0000)
     and 'b01e3a89520186860b956deb0a09c2291cfc5705'


Trivial merge