commit 6d521ad4b09be5d8dd9e2213f8debac984f25204 Merge: c90acd6 a89f4ac Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Fri Sep 3 10:02:54 2010 +1000 Merge branch 'master' into f13 ---