Merge branch '1.8.0' into 1.8.1
authorPavel Labath <pavelo@centrum.sk>
Thu, 18 Mar 2010 20:35:15 +0000 (21:35 +0100)
committerPavel Labath <pavelo@centrum.sk>
Thu, 18 Mar 2010 20:35:15 +0000 (21:35 +0100)

Trivial merge