Merge branch 'MDL-28453'
authorPetr Skoda <commits@skodak.org>
Mon, 25 Jul 2011 14:23:01 +0000 (16:23 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 25 Jul 2011 14:23:01 +0000 (16:23 +0200)

Trivial merge