merge of '75bd0ba9307d9ac6d29617d8194b73d953f31739'
authorKoen Kooi <koen@openembedded.org>
Thu, 22 Feb 2007 16:46:54 +0000 (16:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 22 Feb 2007 16:46:54 +0000 (16:46 +0000)
     and 'bd6c4042069a1378179f439efde37ca93d020a7b'

1  2 
conf/bitbake.conf

Simple merge