From: Ian Beckwith <ianb@erislabs.net>
Date: Sat, 28 Jan 2012 23:10:18 +0000 (+0000)
Subject: Merge branch 'upstream'
X-Git-Tag: 302-1~2
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=ce64b6a4f43fc6bed73872e76805389e7558fd81

Merge branch 'upstream'
---

ce64b6a4f43fc6bed73872e76805389e7558fd81