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

[Jiří Pírko]

commit 04788a1bc2e562b33bb745e0ae13d80eaa308ae1
Merge: 6cdf0a0 48701db
Author: Jiri Pirko <jpirko at redhat.com>
Date:   Thu Jun 28 15:33:08 2012 +0200

    Merge branch 'master' into f16

 .gitignore   |    1 +
 libteam.spec |   26 ++++++++++++++++++++------
 sources      |    2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)
---