merge of '4c745bba392cfbeb0cf77848b5c125b61d003df4'
authorKoen Kooi <koen@openembedded.org>
Mon, 19 Feb 2007 21:47:04 +0000 (21:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 19 Feb 2007 21:47:04 +0000 (21:47 +0000)
     and 'a4676fba67b8fd694663c29eff37d616ac133b40'


Trivial merge