Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Mon, 6 Aug 2012 22:10:39 +0000 (01:10 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Mon, 6 Aug 2012 22:10:39 +0000 (01:10 +0300)

Trivial merge