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

[Christoph Wickert]

commit 6edcd1f7d6dca29114c02e1ec46bbe0370fcc374
Merge: 3c2579a 894239b
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Sep 20 21:06:07 2012 +0200

    Merge branch 'master' into f17

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