Merge branch 'onnode_options'
authorMartin Schwenke <martin@meltin.net>
Fri, 16 Oct 2009 05:39:46 +0000 (16:39 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 16 Oct 2009 05:39:46 +0000 (16:39 +1100)

Trivial merge