[ndisc6: 12/14] Merge remote-tracking branch 'origin/f13/master'

[Stjepan Gros]

commit 89106bfa9a89e105cc7f14bee7338ad474c8c467
Merge: ecafb67 cd1d328
Author: Stjepan Gros <stjepan.gros at gmail.com>
Date:   Tue Mar 15 21:58:26 2011 +0100

    Merge remote-tracking branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	ndisc6.spec
    	sources
    
    Resolved conflicts.

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