Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Thu, 6 Sep 2012 18:44:02 +0000 (11:44 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 6 Sep 2012 18:44:02 +0000 (11:44 -0700)

Trivial merge