merge of '758d1f4ff547286aef7de856b87ca0bd9f743c4c'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Sep 2008 22:41:05 +0000 (22:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Sep 2008 22:41:05 +0000 (22:41 +0000)
     and 'ba02b39ad05fe330967acb43ee7ac802b7fd24b3'


Trivial merge