merge of '129af2bd91ba53785161642a1d0002b55797f5f4'
authorKoen Kooi <koen@openembedded.org>
Tue, 26 Jun 2007 09:44:01 +0000 (09:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 26 Jun 2007 09:44:01 +0000 (09:44 +0000)
     and '477ae0076f30be01a0a3ccbeffc47b13efb2b7c4'


Trivial merge