Remerge pdo into trunk.

git-svn-id: http://2moons.googlecode.com/svn/trunk@2747 b16e238e-0886-11df-aae1-e754eacfc418