Merge branch 'fast_nitx'
authorJean Privat <jean@pryen.org>
Thu, 6 Mar 2014 13:38:15 +0000 (08:38 -0500)
committerJean Privat <jean@pryen.org>
Thu, 6 Mar 2014 13:38:15 +0000 (08:38 -0500)

Trivial merge