Merge blocking branch to head.
authorTom Hughes <tom@compton.nu>
Tue, 6 Oct 2009 12:37:49 +0000 (12:37 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 6 Oct 2009 12:37:49 +0000 (12:37 +0000)
commit32f86316712b8b781dfc2ffde0a5b88b742a6627
tree5fd87de015628b70f1be0c67dacdcca7d2bbd1d4
parent0721a135b6dadc6e9355cbaf68c57e55c4271da0
parent2a9cacb6f1dc635817e9c54bdafd66030808fbe4
Merge blocking branch to head.