merge of 1c17f3bc992735c3812d224e4eec728fd12650f3
authorKoen Kooi <koen@openembedded.org>
Mon, 29 May 2006 13:38:10 +0000 (13:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 May 2006 13:38:10 +0000 (13:38 +0000)
commit9ad7da861459bf8b1a42c04de819c1bc9c44534d
treeee95cfa04eab679c762b8533c2aef3f16749d3a5
parent2db3499796223578d281d5503997e9716cf7421a
parentbc8b949cfbab0654d2818894c1c22c0002a6c010
merge of 1c17f3bc992735c3812d224e4eec728fd12650f3
     and 9c65cea979ed9596cf0a6ec6776d094ce174ea6a