Fixed merge conflict merge-requests/1
authorWillem Liu <willem.liu@gmail.com>
Sat, 30 Apr 2011 00:46:13 +0000 (02:46 +0200)
committerWillem Liu <willem.liu@gmail.com>
Sat, 30 Apr 2011 00:46:13 +0000 (02:46 +0200)

Trivial merge