[skipfish/el6/master: 9/9] Merge remote-tracking branch 'origin/master' into el6/master

[rebus]

commit 078a8ed7bed3ef35f41a8077f1cbbf986e43553b
Merge: c29f195 5648b98
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sun Mar 27 01:31:50 2011 +0100

    Merge remote-tracking branch 'origin/master' into el6/master
    
    Conflicts:
    	.gitignore
    	skipfish.spec

 .gitignore    |    4 ++++
 skipfish.spec |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 30c9089,dd7f23d..a5fd3ca
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,6 @@@
++<<<<<<< HEAD
 +skipfish-1.32b.tgz
++=======
+ skipfish-1.34b.tgz
++>>>>>>> origin/master
  /skipfish-1.84b.tgz