Merge branch 'master' into smaneth-devel
authorKim Nguyễn <kn@lri.fr>
Fri, 19 Oct 2012 15:48:30 +0000 (17:48 +0200)
committerKim Nguyễn <kn@lri.fr>
Fri, 19 Oct 2012 15:48:30 +0000 (17:48 +0200)

Trivial merge