merge of '6c7f9afdafc67f5e5a8263301ca0cfce430be173'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 21 Mar 2007 23:22:30 +0000 (23:22 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 21 Mar 2007 23:22:30 +0000 (23:22 +0000)
commitaae9de2a89a3b6464ba893df30e711b574aa1467
tree1097aac5849b0d58bf0b8c290d7cfba421d92bcf
parenta0c00ff8342e3b41f3feb60b3710665ea7879546
parentdf30e95c8af93e2fafac7cc7bca7ef0f4c27e035
Merge ... '6c7f9afdafc67f5e5a8263301ca0cfce430be173'
     and '8ee01e7aef977a6c51cf71b7d11f65f42e0dc413'