[libguac/f18: 3/3] Merge branch 'master' into f18

[Simone Caronni]

commit 9307d08cee028750e8155f9f8cc17345ac7f0ab0
Merge: b8d77c0 4c60146
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Sep 13 11:30:39 2012 +0200

    Merge branch 'master' into f18

 .gitignore   |    1 +
 libguac.spec |    8 ++++++--
 sources      |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---