Merge commit 'rusty/idtree'
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 10 Jun 2010 03:33:14 +0000 (13:33 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 10 Jun 2010 03:33:14 +0000 (13:33 +1000)

Trivial merge