merge of '7bc0867c76d85a5f85fa0d7a9f66dfd4d9c499bb'
authorKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 23:12:01 +0000 (23:12 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 23:12:01 +0000 (23:12 +0000)
commit1f28e22242c82fe1ba1c4ad8514dd682fc732bc9
tree9c1fca8e80eca12ffbad915855e1938000646de9
parent5c831b65f2ca76c383ae64f63ccd9c94e689fd6e
parent600e48784cd9c43feb691b16dbe162c29b975927
Merge ... '7bc0867c76d85a5f85fa0d7a9f66dfd4d9c499bb'
     and 'c8821bce45c12f64b0b533cda3bbe41267c804d5'