Merge branch 'master' of github.com:voldemort/voldemort
commit81879097b3f07fb16c68b821528b21fbd79dc293
authorZhongjie Wu <www.zj30@gmail.com>
Mon, 18 Jun 2012 19:25:07 +0000 (18 12:25 -0700)
committerZhongjie Wu <www.zj30@gmail.com>
Mon, 18 Jun 2012 19:25:07 +0000 (18 12:25 -0700)
tree50041655ed7b8f21143fc343cfaa37d5e83edaee
parentf23e641f8ea3495cafae6cd46d08610458f72174
parentfbae492ce7e51a21d7a42da0695b17a7a3d32521
Merge branch 'master' of github.com:voldemort/voldemort