merge of '027df8bfceecb5d21ab2b2b76d0d191124b3446b'
authorKoen Kooi <koen@openembedded.org>
Wed, 16 Jul 2008 09:24:30 +0000 (09:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 16 Jul 2008 09:24:30 +0000 (09:24 +0000)
     and 'daafad010cbf738246a5e77122c2e1e4f951c9f5'


Trivial merge