From: ErikZalm <erik@vdzalm.eu>
Date: Fri, 23 Mar 2012 18:54:58 +0000 (-0700)
Subject: Merge pull request #123 from buserror-uk/for-upstream
X-Git-Tag: iwj-success-2012-07-29~47
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8b785f75a601613cf2d77b5c9e5278d20b67f6d4;p=marlin.git

Merge pull request #123 from buserror-uk/for-upstream

For upstream
---

8b785f75a601613cf2d77b5c9e5278d20b67f6d4