[cronie/f13/master: 4/4] Merge branch 'master' into f13

[Marcela Mašláňová]

commit 4db462b9b6aa0dea4e558c4d7bef962cd6dc5394
Merge: 69327f1 e9288c2
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Tue Aug 3 13:50:57 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	cronie.spec
    	sources

 .gitignore  |    2 +-
 cronie.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index aca3933,6d5cb52..07f6e90
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--cronie-1.4.4.tar.gz
+ cronie-1.4.5.tar.gz