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

[Jiří Pírko]

commit cd545fbef2ad304bc7c896207175db1a31066dd6
Merge: c29cfa4 4d575be
Author: Jiri Pirko <jpirko at redhat.com>
Date:   Wed Jun 20 17:02:41 2012 +0200

    Merge branch 'master' into f16

 .gitignore   |    1 +
 libteam.spec |   11 +++++++----
 sources      |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---