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

[Jiří Pírko]

commit c29cfa4e27de753b11aa5761abed430d3ce573e5
Merge: 4d2b5e8 f0954d5
Author: Jiri Pirko <jpirko at redhat.com>
Date:   Fri May 4 14:37:38 2012 +0200

    Merge branch 'master' into f16

 .gitignore   |    1 +
 libteam.spec |   13 ++++++++-----
 sources      |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---