Merge branch 'matthieu/example_monkey'
authorJean Privat <jean@pryen.org>
Wed, 1 May 2013 20:07:59 +0000 (16:07 -0400)
committerJean Privat <jean@pryen.org>
Wed, 1 May 2013 20:07:59 +0000 (16:07 -0400)

Trivial merge