[openvpn/el5/master: 34/34] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit cbe1547c68e5830e6cb9f36335874f87aeee36d4
Merge: a2e87f4 f49c6db
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Apr 25 01:43:25 2011 +0200

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	openvpn.spec
    	sources

 .gitignore   |   10 ++++++++--
 openvpn.spec |   16 ++++++++++++++--
 sources      |    4 ++--
 3 files changed, 24 insertions(+), 6 deletions(-)
---