Merge branch 'master' into memcache memcache
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 16 Nov 2010 19:53:45 +0000 (14:53 -0500)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 16 Nov 2010 19:53:45 +0000 (14:53 -0500)

Trivial merge