commit 4ae37341bed91f2266feb4ca4e239414cd25bff5 Merge: 919c854 9a03b8a Author: Iain Arnell <iarnell at gmail.com> Date: Thu Aug 5 17:18:43 2010 +0200 Merge remote branch 'origin/f13/master' ---