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

[Christoph Wickert]

commit 3c2579a96b7a406a1974d22dc0a3e466f8a0b07c
Merge: 51b6597 06c9429
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Jun 9 20:10:22 2012 +0200

    Merge branch 'master' into f17

 remmina-1.0.0-dsofix.patch |   11 +++++++++++
 remmina.spec               |   14 +++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
---