[libteam/f16: 3/3] Merge branch 'master' into f16

[Jiří Pírko]

commit 95082be888184bcdc246b78159717834c8ec09bc
Merge: 04788a1 38dab42
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Tue Aug 7 17:24:48 2012 +0200

    Merge branch 'master' into f16

 .gitignore   |    2 ++
 libteam.spec |   29 ++++++++++++++++++-----------
 sources      |    2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)
---