merge of '00d174a244aed2a142a8e7eff3c9237d11a3c1e2'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Jun 2007 12:48:50 +0000 (12:48 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Jun 2007 12:48:50 +0000 (12:48 +0000)
commit0e4241493acbaa7bd267c185a60ba579c2b646ae
tree7b8e0207577fe348aabd26bb3d5ae52458f5842f
parent2aee26f49789880f7e28a2da8a7e78706b3fb8ef
parentde9738c679b9d6c8317da4c07cac2e0902d148b4
Merge ... '00d174a244aed2a142a8e7eff3c9237d11a3c1e2'
     and 'ecc40e5d095d4babc358e9cf43848590ee15f357'
packages/konqueror/konqueror-embedded_20070212.bb