Merge branch 'master' into gtk3
authorPhilip Chimento <philip.chimento@gmail.com>
Sat, 25 Aug 2012 21:01:23 +0000 (23:01 +0200)
committerPhilip Chimento <philip.chimento@gmail.com>
Sat, 25 Aug 2012 21:01:23 +0000 (23:01 +0200)

Trivial merge