upstream civicrm-4.2.9-drupal7

Change-Id: I726ba8d48e4d41891a5b2fb44d48a45efe00b563
Merge branch 'contrib' into drupal7
Don't use civi functions during installation!

Change-Id: Ib48076e479c6b4082932d2fb944d03fb7d82f287