merge of '395315f21c6ec4386dc02169f7f643cb89cbaed4'
authorKoen Kooi <koen@openembedded.org>
Wed, 10 Sep 2008 19:12:47 +0000 (19:12 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 10 Sep 2008 19:12:47 +0000 (19:12 +0000)
     and 'cf5908ce033a5955f8dfb1484a6b093f59e90032'


Trivial merge