merge changes from upstream
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 5 Dec 2009 06:19:53 +0000 (01:19 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 5 Dec 2009 06:20:11 +0000 (01:20 -0500)
commite72a6176e3fc3fcf4b1696e3f0ee9cf66509fb4d
tree7015964358d20934cbc78a50340870d9b81fcd1f
parent4edf37a1d5067197741b8dcb0bdb72ce4c299c05
parent263aeb82f0a1a69864ca41cff4dfa2ae0b8b3f05
merge changes from upstream