Resolve
authorMike Taylor <mike@indexdata.com>
Mon, 31 Oct 2011 17:08:38 +0000 (17:08 +0000)
committerMike Taylor <mike@indexdata.com>
Mon, 31 Oct 2011 17:08:38 +0000 (17:08 +0000)

Trivial merge