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

[Jiří Pírko]

commit 6cdf0a07da54c4e9b3f2e0db61aeca768a018316
Merge: cd545fb 860c7b5
Author: Jiri Pirko <jpirko at redhat.com>
Date:   Wed Jun 27 16:29:25 2012 +0200

    Merge branch 'master' into f16

 .gitignore   |    2 ++
 libteam.spec |   20 +++++++++++++++-----
 sources      |    2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)
---