Merge branch 'master' into lua
authorErwan Velu <erwanaliasr1@gmail.com>
Mon, 7 Feb 2011 19:14:36 +0000 (20:14 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Mon, 7 Feb 2011 19:14:36 +0000 (20:14 +0100)

Trivial merge