Merge remote-tracking branch 'alexandre/NIT_DIR'
authorJean Privat <jean@pryen.org>
Mon, 9 Sep 2013 20:29:01 +0000 (16:29 -0400)
committerJean Privat <jean@pryen.org>
Mon, 9 Sep 2013 20:29:01 +0000 (16:29 -0400)

Trivial merge