Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Wed, 20 Jun 2012 12:27:17 +0000 (15:27 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 20 Jun 2012 12:27:17 +0000 (15:27 +0300)

Trivial merge