merge of '8e15d4e806ea459070da1867571a1c81f6748e33'
authorStanislav Brabec <utx@penguin.cz>
Mon, 25 Feb 2008 23:14:08 +0000 (23:14 +0000)
committerStanislav Brabec <utx@penguin.cz>
Mon, 25 Feb 2008 23:14:08 +0000 (23:14 +0000)
commitf72579c982afa0f5372645cdb4e2c9dce75d5b48
tree63827ac8f25de352153777e97d21f3d5e1604964
parent2c8312853e3613d00057dfff29d18c761b8d4fd5
parent155c14e7adac7e1b84a57fb4956d9accdeb4ad44
Merge ... '8e15d4e806ea459070da1867571a1c81f6748e33'
     and 'c720c1f0f144601f43a22e4c9d8312e8df0db716'