[gauche-gl/f15: 5/5] Merge branch 'master' into f15

[Michel Alexandre Salim]

commit 486b4d10fff035e110339f784eb49afad2469869
Merge: 263b8a8 bc7a199
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun May 13 14:24:43 2012 +0700

    Merge branch 'master' into f15

 gauche-gl.spec |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)
---