Merge remote-tracking branch 'origin/unstable' into unstable
authorantirez <antirez@gmail.com>
Sun, 1 Apr 2012 08:15:07 +0000 (10:15 +0200)
committerantirez <antirez@gmail.com>
Sun, 1 Apr 2012 08:15:07 +0000 (10:15 +0200)

Trivial merge