Merging drupal 6.29, resolving conflicts.