Merge branch 'master_MDL-28601'
authorPetr Skoda <commits@skodak.org>
Mon, 8 Aug 2011 14:18:08 +0000 (16:18 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 8 Aug 2011 14:18:08 +0000 (16:18 +0200)

Trivial merge