Resolve
authorMike Taylor <mike@miketaylor.org.uk>
Fri, 18 Sep 2009 16:47:10 +0000 (17:47 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Fri, 18 Sep 2009 16:47:10 +0000 (17:47 +0100)

Trivial merge