Merge commit 'rusty/1.0.112' into 1.0.112
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Mon, 26 Jul 2010 06:49:16 +0000 (16:49 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Mon, 26 Jul 2010 06:49:16 +0000 (16:49 +1000)

Trivial merge