[libguac/el6: 2/2] Merge branch 'master' into el6

[Simone Caronni]

commit 34cf4f71af5fe83797596665b5b1e2b446a8bb76
Merge: 97fb25a 726d746
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Oct 22 13:49:35 2012 +0200

    Merge branch 'master' into el6

 libguac.spec |    6 +++++-
 sources      |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
---