Merge remote-tracking branch 'nathan/gtk'
authorJean Privat <jean@pryen.org>
Thu, 16 May 2013 01:31:13 +0000 (21:31 -0400)
committerJean Privat <jean@pryen.org>
Thu, 16 May 2013 01:31:13 +0000 (21:31 -0400)

Trivial merge