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

[Jiří Pírko]

commit 4d2b5e85a65ffe4cd9d91d92a901d59cfb016f1a
Merge: e40d947 32a298b
Author: Jiri Pirko <jpirko at redhat.com>
Date:   Thu Apr 5 16:14:07 2012 +0200

    Merge branch 'master' into f16

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