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

Trivial merge