From: Ian Beckwith <ianb@erislabs.net>
Date: Tue, 12 Jul 2011 01:47:49 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: 301-1~3
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=284b0342b2ce1ef4648c725579751ff8165da667

Merge branch 'upstream'
---

284b0342b2ce1ef4648c725579751ff8165da667