merge of 'ed07fd1cf78a54a3b29bc5b123624acb39c4f70a'
authorKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 13:38:14 +0000 (13:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 13:38:14 +0000 (13:38 +0000)
     and 'ff89d5794df8f2290ca5cb41d093b3f3083d36c5'


Trivial merge