merge trunk to method-changes branch
authorDave Rolsky <autarch@urth.org>
Mon, 15 Sep 2008 13:32:49 +0000 (13:32 +0000)
committerDave Rolsky <autarch@urth.org>
Mon, 15 Sep 2008 13:32:49 +0000 (13:32 +0000)
commit088d3570fc3b180804564e389b580c46959f4e90
tree87279e7e6067ff15dbfbf9ac81c8e23dadd266db
parent4fb87686e159258937964ab201a092de5d78d508
parenta6b7b0ac50b3696b2fe346a0aa12f97da6cf4502
parent64d085e09e19557b10b001f11b24689dbf5cb36a
merge trunk to method-changes branch