Merge branch 'upstream' into max-sect
authorJeff Garzik <jeff@garzik.org>
Thu, 27 Apr 2006 08:55:26 +0000 (04:55 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 27 Apr 2006 08:55:26 +0000 (04:55 -0400)
commit9a375e93f88269bb770fb2eaa57554c975449c88
tree4c8f6d77f0aa94fc69c5b9e75d51db1451bdf66f
parentb2b4b9a7c09ad66e095b13c97946a96f2dc8284e
parentacc696d93dcf993dec123d69d599979e1456ffec
Merge branch 'upstream' into max-sect