Merge branch 'xorg/master' of /home/git/platal into xorg/master
authorJoão Pedro Athayde Marcondes de André (JP) <jp_git@m4x.org>
Fri, 4 Feb 2011 21:52:43 +0000 (22:52 +0100)
committerJoão Pedro Athayde Marcondes de André (JP) <jp_git@m4x.org>
Fri, 4 Feb 2011 21:52:43 +0000 (22:52 +0100)

Trivial merge