Merge remote-tracking branch 'origin/unstable' into unstable
authorantirez <antirez@gmail.com>
Thu, 28 Jul 2011 12:40:47 +0000 (14:40 +0200)
committerantirez <antirez@gmail.com>
Thu, 28 Jul 2011 12:40:47 +0000 (14:40 +0200)

Trivial merge