merge everything back from mainline branch
author<mako@atdot.cc> <>
Sun, 7 Jun 2009 09:44:11 +0000 (05:44 -0400)
committer<mako@atdot.cc> <>
Sun, 7 Jun 2009 09:44:11 +0000 (05:44 -0400)
commitda8a3c5c6efcad4e4a5424a09c0479f7ee52a9ec
treec8c0e91dd9d2f70d04de4b8af297271c847d37e0
parentd06c024c7dddeca27c658b668ed313f3f107d2e6
parentf7e185abe92cf8a4590f32996c86d15b8309db86
merge everything back from mainline branch

Benjamin Mako Hill || Want to submit a patch?