Merge branch 'stable-3.2' into pandora-3.2-stable
authorGrazvydas Ignotas <notasas@gmail.com>
Tue, 3 Apr 2012 20:58:50 +0000 (23:58 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Tue, 3 Apr 2012 20:58:50 +0000 (23:58 +0300)

Trivial merge