Merge commit 'rusty/tdb-update'
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 22 Apr 2010 23:25:25 +0000 (09:25 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 22 Apr 2010 23:25:25 +0000 (09:25 +1000)

Trivial merge