Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
authorAdam Sieradzan <adasko@piasek2.(none)>
Thu, 8 Aug 2013 00:16:23 +0000 (02:16 +0200)
committerAdam Sieradzan <adasko@piasek2.(none)>
Thu, 8 Aug 2013 00:16:23 +0000 (02:16 +0200)

Trivial merge