[ndisc6: 13/14] Merge remote-tracking branch 'origin/el5/master'

[Stjepan Gros]

commit 22e1d78769bf949473e904419c46b5dcb7e789cb
Merge: 89106bf 38cb0f3
Author: Stjepan Gros <stjepan.gros at gmail.com>
Date:   Tue Mar 15 22:00:15 2011 +0100

    Merge remote-tracking branch 'origin/el5/master'
    
    Conflicts:
    	.gitignore
    	ndisc6.spec
    	sources
    
    Manually resolved conflicts.

 .gitignore |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index fd87a9c,bead96d..db82fca
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,2 +1,1 @@@
--ndisc6-0.9.9.tar.bz2
- ndisc6-1.0.0.tar.bz2
 -/ndisc6-1.0.0.tar.bz2
 +ndisc6-1.0.1.tar.bz2