Merge branch 'memcachedkumofs'
Cédric de Saint Martin authored
10e3ae2a