Merge remote branch 'martins/nodestatus'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 3 Jan 2012 01:31:37 +0000 (12:31 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 3 Jan 2012 01:31:37 +0000 (12:31 +1100)

Trivial merge