Add 2.0.6.GlusterFS to trunk from branch-1.6.1 (Scott Creeley via eboyd)