merge of '545c0e37f05fb065b7d1cf9794137b60fa5113f7'
authorStanislav Brabec <utx@penguin.cz>
Sun, 18 May 2008 21:54:31 +0000 (21:54 +0000)
committerStanislav Brabec <utx@penguin.cz>
Sun, 18 May 2008 21:54:31 +0000 (21:54 +0000)
commit1eb0034152636b9945af02360af6ca8be131d671
treeaa569b98a41e5fe7f99add42fec7c527e7fe15c0
parenteb30f93add7705ed5185b662a3ef8cfcdc904156
parent522855b0497d48717f15d4d3ad3b7efa0d99b5fe
Merge ... '545c0e37f05fb065b7d1cf9794137b60fa5113f7'
     and '7143762e383df9fc9356ff275341deee72ec1a85'