[development] merging node tables (was: Drupal 6 code freeze)