merge of '10e6bf1f992b208b919b4fc707871e1e1ae7e91e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 23 Aug 2008 13:23:05 +0000 (13:23 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 23 Aug 2008 13:23:05 +0000 (13:23 +0000)
commit548b4dda4ac765a278976c9face5d815b0c0e732
treec8db1f08efad7d4563cf65439f643cf1c176c3b1
parent85d5a47a22f6b65960cc1f341a43102bf1f74a66
parenta0729f86dbe321f193a772066b257213655356cd
Merge ... '10e6bf1f992b208b919b4fc707871e1e1ae7e91e'
     and 'aeb148ecdb7be061e0dc9a58ffebbeca28f2e26d'