Merge branch 'killis' into killnitc
authorJean Privat <jean@pryen.org>
Wed, 27 Nov 2013 15:24:09 +0000 (10:24 -0500)
committerJean Privat <jean@pryen.org>
Wed, 27 Nov 2013 15:24:09 +0000 (10:24 -0500)

Trivial merge