Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@intersec.com>
Sun, 27 Mar 2011 14:33:39 +0000 (16:33 +0200)
committerFlorent Bruneau <florent.bruneau@intersec.com>
Sun, 27 Mar 2011 14:33:39 +0000 (16:33 +0200)
commita5122b6480994a35fe6c0d88ccd9c6dfff761364
tree6257ea46d830b4cb86efbfb5ecbfeaef94d05bda
parent7b8183f008f935d6b2fab1ec772ef80207669544
parent5cfb3dd10421468779a740595b3e5e68aba9838e
Merge remote-tracking branch 'origin/xorg/maint' into xorg/master