Merge branch 'master_MDL-28535'
authorPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 12:35:21 +0000 (14:35 +0200)
committerPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 12:35:21 +0000 (14:35 +0200)

Trivial merge