Merge branch 'master_MDL-28410'
authorPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 13:01:15 +0000 (15:01 +0200)
committerPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 13:01:15 +0000 (15:01 +0200)

Trivial merge