[glusterfs/f18: 2/2] Merge branch 'master' into f18

[Niels de Vos]

commit 57fb775bd34192a279b9e96fe2e83740ed4ca6a7
Merge: 8e0eaee 50bcf70
Author: Niels de Vos <devos at fedoraproject.org>
Date:   Wed Oct 9 12:04:29 2013 +0200

    Merge branch 'master' into f18

 glusterfs.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---