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

[Stjepan Gros]

commit ad4abfafd26ae222f5606fe456d8a044a820af30
Merge: 22e1d78 74b731e
Author: Stjepan Gros <stjepan.gros at gmail.com>
Date:   Tue Mar 15 22:01:29 2011 +0100

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

---