[febootstrap/f17: 11/11] fix merge

[Peter Robinson]

commit cd6ef1afcb30fcc4e0be4905001749da7b3795cc
Merge: 87a3fb8 fbde7ff
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Apr 13 14:13:31 2012 +0100

    fix merge

 .gitignore                                         |   20 +----------
 ...LAG_64BITS-when-creating-the-ext2-filesys.patch |   31 ++++++++++++++++
 febootstrap.spec                                   |   38 ++++++++++++-------
 sources                                            |    2 +-
 4 files changed, 57 insertions(+), 34 deletions(-)
---
diff --cc .gitignore
index 99b630e,91220d0..757c233
--- a/.gitignore
+++ b/.gitignore
@@@ -1,19 -1,20 +1,1 @@@
--febootstrap-2.7.tar.gz
--/febootstrap-2.8.tar.gz
--/febootstrap-2.9.tar.gz
--/febootstrap-2.10.tar.gz
--/febootstrap-2.11.tar.gz
--/febootstrap-3.0.tar.gz
--/febootstrap-3.1.tar.gz
--/febootstrap-3.2.tar.gz
--/febootstrap-3.3.tar.gz
--/febootstrap-3.4.tar.gz
--/febootstrap-3.5.tar.gz
--/febootstrap-3.6.tar.gz
--/febootstrap-3.7.tar.gz
--/febootstrap-3.8.tar.gz
--/febootstrap-3.9.tar.gz
--/febootstrap-3.10.tar.gz
--/febootstrap-3.11.tar.gz
--/febootstrap-3.12.tar.gz
--/febootstrap-3.13.tar.gz
 -/febootstrap-3.14.tar.gz
++/febootstrap-*.tar.gz