Merge branch 'MDL-25713_m2_recordset'
authorPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 11:05:22 +0000 (12:05 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 11:05:22 +0000 (12:05 +0100)

Trivial merge