From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Fri, 13 Jun 2008 12:59:32 +0000 (+0200)
Subject: Merge branch 'master' into hruid
X-Git-Tag: xorg/0.10.0~86^2~94
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=285596e4fdf65e9871c07bf33b6e674584868509;hp=-c;p=platal.git

Merge branch 'master' into hruid
---

285596e4fdf65e9871c07bf33b6e674584868509