[system-config-network/f17: 2/2] Merge branch 'f16' into f17

[Jiří Popelka]

commit d048011d7e300341598b408d86c98249a7352ff3
Merge: 0b3534f 4a37260
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Aug 20 13:03:57 2012 +0200

    Merge branch 'f16' into f17

 .gitignore                 |    1 +
 sources                    |    2 +-
 system-config-network.spec |    6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)
---