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

[Simone Caronni]

commit 5488d1256ffc8bb7c79d6a3e7bb2a3c61ca5c05f
Merge: d2b45b8 bea80cf
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Feb 14 10:41:39 2013 +0100

    Merge branch 'master' into f17

 libguac.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---