Merge remote branch 'upstream/master'
authorguibog <guibog@douban.com>
Sat, 21 Apr 2012 14:08:23 +0000 (22:08 +0800)
committerguibog <guibog@douban.com>
Sat, 21 Apr 2012 14:08:23 +0000 (22:08 +0800)

Trivial merge