From: Peter Gammie <peteg42@gmail.com>
Date: Thu, 30 Sep 2010 23:48:03 +0000 (+1000)
Subject: Merge branch 'joey' into revert
X-Git-Tag: 3.20101019~19^2~31^2~4
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/eba5c715144024f4784538af256ffa9d7fcb8a2d

Merge branch 'joey' into revert
---

eba5c715144024f4784538af256ffa9d7fcb8a2d