merge of '846cac1d65f36e1abe1166e8c149a74192ad56e7'
authorKoen Kooi <koen@openembedded.org>
Fri, 11 May 2007 09:24:10 +0000 (09:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 11 May 2007 09:24:10 +0000 (09:24 +0000)
     and 'd9ba9ec9ce6f5317b9b28dbd4e98e4cb52ecb6f6'


Trivial merge