merge of '4a1fbbf2b807b7eb3928563bc7f680eeced17553'
authorStanislav Brabec <utx@penguin.cz>
Tue, 15 Jul 2008 13:06:18 +0000 (13:06 +0000)
committerStanislav Brabec <utx@penguin.cz>
Tue, 15 Jul 2008 13:06:18 +0000 (13:06 +0000)
commit9271cfee20d1bdc311303da8551a90beed45dc54
tree81ba6d920bcae6dde92c143847e3bafa437447c8
parent884ef331b553ac6807bb5d6bf2c7c4e6cf75e7e3
parent69c57bbb3b7fdf5561683f2d16346d867e1da15c
Merge ... '4a1fbbf2b807b7eb3928563bc7f680eeced17553'
     and 'd8ffa6c8873c2065b7bd097d105c2bea68ac7d4a'