Merge branch 'master_MDL-28493'
authorPetr Skoda <commits@skodak.org>
Wed, 3 Aug 2011 06:27:52 +0000 (08:27 +0200)
committerPetr Skoda <commits@skodak.org>
Wed, 3 Aug 2011 06:27:52 +0000 (08:27 +0200)

Trivial merge