merge of '458c1e5b4ce9ec5e2754fea2e5c1df842fe9936c'
authorKoen Kooi <koen@openembedded.org>
Sun, 1 Apr 2007 08:50:18 +0000 (08:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 1 Apr 2007 08:50:18 +0000 (08:50 +0000)
     and 'ff961d04d5b4acc6a7fa9aea54c938273c1a34c8'


Trivial merge