From: Ian Beckwith <ianb@erislabs.net>
Date: Fri, 17 Jun 2011 19:29:43 +0000 (+0100)
Subject: Merge branch 'upstream' into test
X-Git-Tag: 301-1~34
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=411dc6a9768de308b60f383ce5c278b25b740122

Merge branch 'upstream' into test
---

411dc6a9768de308b60f383ce5c278b25b740122