commit f3a55835058a888b59361db25fcd6d418754eb44 Merge: 748a6b7 a89f4ac Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Fri Sep 3 10:21:04 2010 +1000 Merge branch 'master' into f12 ---