Merge commit 'rusty/tdb-update'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 8 Oct 2010 01:49:08 +0000 (12:49 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 8 Oct 2010 01:49:08 +0000 (12:49 +1100)

Trivial merge