[ipv6calc/f13/master: 12/12] Merge branch 'master' into f13

[Marcela Mašláňová]

commit 41bc74f09989323b51a83d8e664372e76461851f
Merge: 3ad8a47 81fb1cb
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Tue Jan 4 10:57:45 2011 +0100

    Merge branch 'master' into f13

 .gitignore    |    2 +-
 ipv6calc.spec |   19 ++++++++++---------
 sources       |    2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index 34bb97b,041c669..5a587d1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--ipv6calc-0.73.0.tar.gz
 -/ipv6calc-0.80.0.tar.gz
++ipv6calc-0.80.0.tar.gz