merge of 'a94d96e725d7b1b902a9b09b6c9628a3d59d5cf8'
authorKoen Kooi <koen@openembedded.org>
Tue, 29 Jul 2008 20:30:34 +0000 (20:30 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 29 Jul 2008 20:30:34 +0000 (20:30 +0000)
     and 'e70bb85147c1884a42eb239c03283cb35fc63033'


Trivial merge