Merge remote branch 'ddiss/master_pmda_namespace' master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 31 Oct 2011 09:25:16 +0000 (20:25 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 31 Oct 2011 09:25:16 +0000 (20:25 +1100)

Trivial merge