Merge branch '1.8.0' into 1.8.1
authorPavel Labath <pavelo@centrum.sk>
Wed, 3 Mar 2010 10:59:15 +0000 (11:59 +0100)
committerPavel Labath <pavelo@centrum.sk>
Wed, 3 Mar 2010 10:59:15 +0000 (11:59 +0100)
Conflicts:
configure.ac.in


Trivial merge