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

[Jiří Pírko]

commit 954c433eab7f77fd64476e9bae49fa64bc1c8bab
Merge: 4168dce 562fae8
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Tue Oct 15 15:14:14 2013 +0200

    Merge branch 'master' into f19

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