[libndp/f19: 9/9] Merge branch 'master' into f19

[Jiří Pírko]

commit c37be46b7a9b03de728e9c7010ff05ac11e739c0
Merge: 954c433 33d2c69
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Tue Jul 29 15:39:14 2014 +0200

    Merge branch 'master' into f19

 .gitignore  |    2 ++
 libndp.spec |   16 +++++++++++++++-
 sources     |    2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)
---