b75cf9292c35
Merge in the changes I forgot to pull.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Tue, 23 Jun 2009 19:02:16 -0400 | 
| parents | 2e174ecf0ce1 (current diff) f0242d032ba3 (diff) | 
| children | 7903ea8c1103 | 
| branches/tags | (none) | 
| files | .hgrc | 
Merge in the changes I forgot to pull.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Tue, 23 Jun 2009 19:02:16 -0400 | 
| parents | 2e174ecf0ce1 (current diff) f0242d032ba3 (diff) | 
| children | 7903ea8c1103 | 
| branches/tags | (none) | 
| files | .hgrc |