Merge branch 'wip-MDL-28191-master'
authorPetr Skoda <commits@skodak.org>
Mon, 25 Jul 2011 14:45:40 +0000 (16:45 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 25 Jul 2011 14:45:40 +0000 (16:45 +0200)

Trivial merge