Merge commit 'martins/onnode_options'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 14 Oct 2009 04:51:57 +0000 (15:51 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 14 Oct 2009 04:51:57 +0000 (15:51 +1100)

Trivial merge