[horde/f13/master: 5/5] Merge branch 'master' into f13

[Nick Bebout]

commit 09356f0cb7932d83fa969411eecddcedd643afae
Merge: 71ddcfb 8333d06
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Oct 19 11:11:21 2010 -0400

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

 .gitignore |    2 +-
 horde.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index e6110a7,964c608..5d3ea6b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--horde-3.3.8.tar.gz
+ /horde-3.3.9.tar.gz