Merge branch 'fixes' into devel
authorJaroslav Kysela <perex@perex.cz>
Tue, 16 Feb 2010 10:19:18 +0000 (11:19 +0100)
committerJaroslav Kysela <perex@perex.cz>
Tue, 16 Feb 2010 10:19:18 +0000 (11:19 +0100)

Trivial merge