merge of '2ae98c73d0708cb2d224fbf130a90805e19503ee'
authorKoen Kooi <koen@openembedded.org>
Thu, 25 Sep 2008 12:37:36 +0000 (12:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 25 Sep 2008 12:37:36 +0000 (12:37 +0000)
     and '9b5a0eebc140a11b64876ab88fc1ca50059ff6fa'


Trivial merge