Merge remote-tracking branch 'alexandre/fix-vt-redef'
authorJean Privat <jean@pryen.org>
Thu, 27 Feb 2014 20:32:52 +0000 (15:32 -0500)
committerJean Privat <jean@pryen.org>
Thu, 27 Feb 2014 20:32:52 +0000 (15:32 -0500)

Trivial merge