[gauche/f15: 6/6] Merge commit '055ac4c0c4cec41a4ae881ae0116584b354f1f66' into f15

[Michel Alexandre Salim]

commit 2e34b18720dd94997ab6a95161e06c1bea5760f7
Merge: f4f9fd0 055ac4c
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Wed Sep 14 00:47:15 2011 +0200

    Merge commit '055ac4c0c4cec41a4ae881ae0116584b354f1f66' into f15

 .gitignore  |    3 +--
 gauche.spec |   43 ++++++++++++++++++++++++++-----------------
 sources     |    2 +-
 3 files changed, 28 insertions(+), 20 deletions(-)
---