merge of '0861d84183b87e92faf78d32bd0fe71c50d9db81'
authorStanislav Brabec <utx@penguin.cz>
Thu, 14 Feb 2008 18:12:25 +0000 (18:12 +0000)
committerStanislav Brabec <utx@penguin.cz>
Thu, 14 Feb 2008 18:12:25 +0000 (18:12 +0000)
commit47046bd6f427d78035a6096bff67d4afa9c623a6
tree1b8fa9036a389648951b09804109f5451a6d2c4c
parent25a3fc03e7198347da289efab657f49278754eee
parent5f98849db72e0f24493f80b5204f3086217998f7
Merge ... '0861d84183b87e92faf78d32bd0fe71c50d9db81'
     and 'a74635b601bde68329566b8107d8a298996f1da8'