Merge remote-tracking branch 'github/pr/291/head'
authorJean Privat <jean@pryen.org>
Thu, 27 Feb 2014 21:29:14 +0000 (16:29 -0500)
committerJean Privat <jean@pryen.org>
Thu, 27 Feb 2014 21:29:14 +0000 (16:29 -0500)

Trivial merge