commit e3a77fa65db0e97554ff58ed90fbb8b2217fa68e Merge: 50856c2 708ba4c Author: Iain Arnell <iarnell at gmail.com> Date: Thu Aug 5 17:33:58 2010 +0200 Merge remote branch 'origin/f13/master' ---