Merge.
commit85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b
authorAlan Mackenzie <acm@muc.de>
Thu, 3 Nov 2011 22:03:18 +0000 (3 22:03 +0000)
committerAlan Mackenzie <acm@muc.de>
Thu, 3 Nov 2011 22:03:18 +0000 (3 22:03 +0000)
tree2a207d6e9e906119087ad357c892414db01211cb
parenta6ba2ab9277496b66f6939766a3470c1f0a84287
parent14e1d9eab9f4b7341f92397a0a9a2706f7b26ee9
Merge.