[ldapvi/el6: 7/7] Merge branch 'master' into el6

[Matej Cepl]

commit 6bc8b0c1dee8f2e6c738e5694d0816896dbea245
Merge: 59d9266 d375b92
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri May 13 00:26:24 2011 +0200

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

 dont-set-encoding-in-vim-modeline.diff |   13 +++++++++++++
 ldapvi-1.7.tar.gz                      |  Bin 119503 -> 0 bytes
 ldapvi.spec                            |   14 ++++++++++++--
 3 files changed, 25 insertions(+), 2 deletions(-)
---