Merge remote-tracking branch 'upstream/develop' into develop
authorZbigniew Siciarz <antyqjon@gmail.com>
Thu, 16 Jun 2011 06:56:38 +0000 (08:56 +0200)
committerZbigniew Siciarz <antyqjon@gmail.com>
Thu, 16 Jun 2011 06:56:38 +0000 (08:56 +0200)

Trivial merge