Merge branch 'domains3'
authorisaacs <i@izs.me>
Tue, 17 Apr 2012 20:36:29 +0000 (13:36 -0700)
committerisaacs <i@izs.me>
Tue, 17 Apr 2012 20:36:29 +0000 (13:36 -0700)

Trivial merge