Merge branch 'bug301'
authorSteve Singer <ssinger@ca.afilias.info>
Fri, 26 Jul 2013 14:23:55 +0000 (10:23 -0400)
committerSteve Singer <ssinger@ca.afilias.info>
Fri, 26 Jul 2013 14:23:55 +0000 (10:23 -0400)

Trivial merge