Merge branch 'master' into devInfo
authorGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Mon, 20 Apr 2009 23:27:42 +0000 (19:27 -0400)
committerGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Mon, 20 Apr 2009 23:27:42 +0000 (19:27 -0400)

Trivial merge