Grr
Merge branch 'memcached-1.4.20' of github.com:trauzti/mimir into memcached-1.4.20