Merge from trunk.
authorAlan Mackenzie <acm@muc.de>
Wed, 18 Jan 2012 11:50:27 +0000 (11:50 +0000)
committerAlan Mackenzie <acm@muc.de>
Wed, 18 Jan 2012 11:50:27 +0000 (11:50 +0000)

Trivial merge