Merge andrepl.(none):/net/koti/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/5.0

into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog


mysql-test/t/rpl_openssl.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  manual merge