merge of '7b822d191962a6aa7f36fbc3f5fc943962cf04a4'
authorKoen Kooi <koen@openembedded.org>
Mon, 27 Nov 2006 12:46:12 +0000 (12:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 27 Nov 2006 12:46:12 +0000 (12:46 +0000)
     and 'b53b3fbf92c1c0c6575e30aa48732b33fab1451b'


Trivial merge