[ark/f17: 9/9] Merge branch 'master' into f17

[Than Ngo]

commit 48b54b97ce06a11309bf516698b6bd9d90861b9b
Merge: 3a4fbe4 96eb51a
Author: Than Ngo <than at redhat.com>
Date:   Thu Mar 7 13:34:20 2013 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	ark.spec
    	sources

 .gitignore                                       |    1 +
 ark-4.9.97-improve_subfolder_autodetection.patch |   80 ++++++++++++++++++++++
 ark-4.9.97-r107635.patch                         |   11 +++
 ark.spec                                         |   38 +++++++++-
 sources                                          |    2 +-
 5 files changed, 127 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 2fdae3f,870217a..97a3eb9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/ark-4.8.5.tar.xz
 +/ark-4.9.1.tar.xz
 +/ark-4.9.2.tar.xz
 +/ark-4.9.3.tar.xz
 +/ark-4.9.4.tar.xz
 +/ark-4.9.5.tar.xz
+ /ark-4.10.1.tar.xz