move from branch
authorSylvain Petreolle <spetreolle@yahoo.fr>
Sun, 11 Feb 2007 11:21:14 +0000 (11:21 +0000)
committerSylvain Petreolle <spetreolle@yahoo.fr>
Sun, 11 Feb 2007 11:21:14 +0000 (11:21 +0000)
svn path=/trunk/; revision=25781


Trivial merge