merge of 'a2e94fc6726520d64a4b0a9aa3e4609de4ec7bd2'
authorStanislav Brabec <utx@penguin.cz>
Mon, 14 Jul 2008 16:28:32 +0000 (16:28 +0000)
committerStanislav Brabec <utx@penguin.cz>
Mon, 14 Jul 2008 16:28:32 +0000 (16:28 +0000)
     and 'fd7e5dadc748e094b6f43b6a5f9ba54db3d3c695'


Trivial merge