[system-config-network: 2/2] Merge branch 'f14'

[Jiří Popelka]

commit 982c81146535a6061adfa31c49b246f65b01a0b7
Merge: 9d7c35e 62a5abb
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Dec 2 11:05:32 2010 +0100

    Merge branch 'f14'

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