[freerdp/f18: 2/2] Merge branch 'f17' into f18

[Mads Kiilerich]

commit 8e49ef08f534c74f704baeade487679f63e631da
Merge: 527bd98 7b86839
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Sun Sep 30 23:10:49 2012 +0200

    Merge branch 'f17' into f18
    
    Conflicts:
    	freerdp.spec

 c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch |   53 ++++++++++++++++++++++++
 freerdp.spec                                   |    7 +++-
 2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --cc freerdp.spec
index 816a3d2,f69ce53..d3140da
--- a/freerdp.spec
+++ b/freerdp.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           freerdp
  Version:        1.0.1
--Release:        6%{?dist}
++Release:        7%{?dist}
  Summary:        Remote Desktop Protocol client
  
  Group:          Applications/Communications
@@@ -164,8 -166,8 +166,11 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
 -* Thu Apr 26 2012 Mads Kiilerich <mads at kiilerich.com> - 1.0.1-6
 -- Backport fix for bug 816692
++* Sun Sep 30 2012 Mads Kiilerich <mads at kiilerich.com> - 1.0.1-7
++- merge f17 1.0.1-6 - Backport fix for bug 816692
++
 +* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
  
  * Wed Feb 29 2012 Mads Kiilerich <mads at kiilerich.com> - 1.0.1-5
  - Use new upstream tar with standard naming