This commit was manufactured as part of Drupal's Great Git Migration to create branch 'DRUPAL-6--2'.
Sprout from master 2009-09-10 17:12:17 UTC Jason Savino <jasonrsavino@411241.no-reply.drupal.org> 'Updating missing files'
Cherrypick from master 2009-09-10 21:30:40 UTC Jason Savino <jasonrsavino@411241.no-reply.drupal.org> 'no message':
node.tpl.php
Cherrypick from unlabeled-1.4.4 2009-09-10 21:15:35 UTC Jason Savino <jasonrsavino@411241.no-reply.drupal.org> 'no message':
nifty50.info
Delete:
block-admin-display-form.tpl.php
block.tpl.php