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)
commitba13effd8716620e9cf836f2b92389c236b78742
treec21ba95841c79b3d17e6e20e1da53d36f76dab51
parentf276af8cdf060a01b0c6502437fed0f52de663e1
parentefa25d85f7325d23744d934f0a39e704795824cc
Merge ... '75bd0ba9307d9ac6d29617d8194b73d953f31739'
     and 'bd6c4042069a1378179f439efde37ca93d020a7b'
conf/bitbake.conf