Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Fri, 5 Oct 2012 20:23:58 +0000 (13:23 -0700)
committerMark Wells <mark@freeside.biz>
Fri, 5 Oct 2012 20:23:58 +0000 (13:23 -0700)

Trivial merge