Merge from Trevor.
authorChris Ball <cjb@laptop.org>
Tue, 22 Jun 2010 19:57:58 +0000 (15:57 -0400)
committerChris Ball <cjb@laptop.org>
Tue, 22 Jun 2010 19:57:58 +0000 (15:57 -0400)
commit9763adba687a0e8921187702dd55e9a7083c9db4
tree5f2bc55869722d7518b0e61e39b6deebe9dec0f4
parent6edc7b6e25b4b59b45e157d9d55816fa9dcfe494
parent7755c210fd7003479f60d5699e6f638bcd370fe6
Merge from Trevor.