From: ErikZalm <erik@vdzalm.eu>
Date: Mon, 27 Feb 2012 16:38:36 +0000 (-0800)
Subject: Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd
X-Git-Tag: iwj-success-2012-07-29~82
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=071eec7aa7f07d45077c8a7cc07069e77dbc001a;p=marlin.git

Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd

Clean up and add some trace info
---

071eec7aa7f07d45077c8a7cc07069e77dbc001a