Merge branch 'bug298'
authorSteve Singer <ssinger@ca.afilias.info>
Wed, 10 Jul 2013 17:23:56 +0000 (13:23 -0400)
committerSteve Singer <ssinger@ca.afilias.info>
Wed, 10 Jul 2013 17:23:56 +0000 (13:23 -0400)

Trivial merge