Merge branch 'master' of https://github.com/pressflow/6
merging patch for D6.29-31 from PF, https://github.com/pressflow/6
Merge in 6.30