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)
commitf53d69bbe83e6a9f60bd20411d3b71a394776772
tree172332c0ed146ed8b01306ec8de82f4a6bb991ae
parent0c09ead0048a9d9578c9e7a7a87afcd1088e0d8a
parentb5ed03fd43e0fd59286284cad6c5df3a7de6a6eb
Merge branch 'xorg/master' of /home/git/platal into xorg/master