merge of '91b2ffc800916b90a5871806e605e65d6b2806d2'
authorKoen Kooi <koen@openembedded.org>
Sat, 13 Jan 2007 13:07:55 +0000 (13:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 13 Jan 2007 13:07:55 +0000 (13:07 +0000)
     and 'af92592c9cfb22c3fe7c7dc2280bb03043a3a22f'


Trivial merge