Catching HEAD back up with all the changes on DRUPAL-6--3. Now ready to move forward with the 7.x port!