commit 57c75fc5c5ee27ec882dfd52010410bb023b9068 Merge: 4600884 dfef28e Author: Iain Arnell <iarnell at gmail.com> Date: Thu Aug 5 18:00:12 2010 +0200 Merge remote branch 'origin/f12/master' ---