merge of '19314063bd11741e9ecbaaf39f836c03d4127357'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Oct 2008 11:48:02 +0000 (11:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 2 Oct 2008 11:48:02 +0000 (11:48 +0000)
     and '3fdbb9ca8878cd328a406fdd3338f21ab71a3f3d'


Trivial merge