Merging drupal 6.29, resolving conflicts.
Merge branch 'pressflow-6.29'
Drupal 6.30
Merging Drupal 6.30

new schema and update function to put it into place.
Merging Drupal 6.30

new sql call to get openid association
Merging Drupal 6.30

updated version # to 6.30
Merge pull request #74 from purdy/master

updated to 6.30
Drupal 6.31 via cherry-pick

fixes #82
Merge pull request #83 from pressflow/SA-CORE-2014-002

Drupal 6.31 via cherry-pick
Fix #84 by using drupal_page_is_cacheable()
Merge pull request #85 from pressflow/SA-CORE-2014-002-fix

Fix #84 by using drupal_page_is_cacheable()
Drupal 6.31