[horde/el5/master: 22/22] Merge branch 'master' into el5

[Nick Bebout]

commit 51e56f69813b342b8bbffae06d868d334bbc19a4
Merge: c08969c 387dd5a
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Feb 9 20:45:52 2011 +0000

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	horde.spec
    	registry.php
    	sources

 .gitignore   |    4 +++-
 horde.spec   |   16 ++++++++++++++--
 registry.php |    5 +++--
 sources      |    2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)
---