upstream/3.6.9.Final

miguel@miguel.cc

fdce2a26 · Upstream import 3.6.9.Final · Dec 25, 2011

Upstream release 3.6.9.Final