[glusterfs/kk-el6: 22/22] Merge branch 'master' into kk-el6 for 3.4.1-3 release

[Niels de Vos]

commit afc762c964f10db43011804c2a0ee6246989b78e
Merge: 964843a a9739ec
Author: Niels de Vos <devos at fedoraproject.org>
Date:   Sun Oct 27 14:08:57 2013 +0100

    Merge branch 'master' into kk-el6 for 3.4.1-3 release
    
    Conflicts:
    	glusterfs.spec

 glusterfs-3.4.1.add.base-port.config.option.patch |  156 +++++++++++++++++++++
 glusterfs.spec                                    |   20 +++-
 glusterfsd.service                                |   14 ++-
 3 files changed, 182 insertions(+), 8 deletions(-)
---