[cabextract/el6/master: 6/6] Merge branch 'f15' into el6

[Jan-Frode Myklebust]

commit 5aeddd02ad0b0ef4143822cffc4ef4be4fa082b3
Merge: 76f70c3 beb24d2
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Tue Mar 22 13:19:40 2011 +0100

    Merge branch 'f15' into el6
    
    Conflicts:
    	.gitignore

 .gitignore             |    2 +-
 cabextract-macro.patch |  111 ------------------------------------------------
 cabextract.spec        |   24 ++++++----
 sources                |    2 +-
 4 files changed, 16 insertions(+), 123 deletions(-)
---
diff --cc .gitignore
index d98b2b9,f47efb0..a516abc
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--cabextract-1.2.tar.gz
 -/cabextract-1.3.tar.gz
++cabextract-1.3.tar.gz