[ldapvi/el4: 5/5] Merge branch 'master' into el4

[Matej Cepl]

commit 71bb875a8d58e829706979fa40ab8f19154a6ec2
Merge: 0ee0dbd 4b77329
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri May 13 00:16:04 2011 +0200

    Merge branch 'master' into el4
    
    Conflicts:
    	ldapvi.spec

 dont-set-encoding-in-vim-modeline.diff |   13 +++++++++++++
 ldapvi.spec                            |   14 ++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---