[slashem: 6/7] Merge remote branch 'origin/f13/master'

[Iain Arnell]

commit 460088435f4edde974977a2e1424c7dcdd04d81f
Merge: 27c5e3b 42da54e
Author: Iain Arnell <iarnell at gmail.com>
Date:   Thu Aug 5 18:00:03 2010 +0200

    Merge remote branch 'origin/f13/master'

---