Merge branch 'patch-20' of https://github.com/gjones2/Freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 19 Jan 2013 19:31:10 +0000 (11:31 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 19 Jan 2013 19:31:10 +0000 (11:31 -0800)

Trivial merge