merge of '1f9ecef5aa14483fc6f8eb9ea98c7a709ec92c5a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 22 Aug 2008 23:24:39 +0000 (23:24 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 22 Aug 2008 23:24:39 +0000 (23:24 +0000)
commita573b1c570494350dcf3a15e315ad3f077386c6f
tree2137412f4f0de9faed814c88827f9962be307784
parent2eef4fdb3485274514f57cab82aff96752712b71
parentf75e5aedb17628e46420aaff3d460934056c42d2
Merge ... '1f9ecef5aa14483fc6f8eb9ea98c7a709ec92c5a'
     and 'a9ff99e803ab2437983f68e64198879cfb336247'