Commit 115ab36fceee69740a01ce49bc27e1908cc237b1

Anthony Green 2009-12-24T00:22:00

Update missing changes for 3.0.9r4.