[glusterfs/kk-el5: 2/2] Merge branch 'master' into kk-el5

[Niels de Vos]

commit 1ccb4ba84a12c5f56319d8215cbf11a0356a0a93
Merge: c2f197f b609dc6
Author: Niels de Vos <devos at fedoraproject.org>
Date:   Wed Dec 25 15:59:41 2013 +0100

    Merge branch 'master' into kk-el5

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---