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

[Jiří Pírko]

commit 25146e2c84e1d2160326e4ab1de1a70a70881d5d
Merge: 4168dce 562fae8
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Tue Oct 15 16:05:50 2013 +0200

    Merge branch 'master' into f18

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