into  bk-internal.mysql.com:/tmp/knielsen/mysql-5.1-new-maint


extra/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
storage/ndb/config/common.mk.am:
  Auto merged
storage/ndb/config/type_ndbapitools.mk.am:
  Auto merged
storage/ndb/src/common/portlib/Makefile.am:
  Auto merged
storage/ndb/src/kernel/Makefile.am:
  Auto merged