merge of '5488dcb57b02d59ec27d65e068bc0069a4e4c86e'
authorKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 16:11:31 +0000 (16:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 16:11:31 +0000 (16:11 +0000)
     and 'a3d194bab430424d2cb654ed59d6b0f9f8952f83'


Trivial merge