Merge 'trunk' into 'replication_dedux'
Luke Saunders [Wed, 9 Jul 2008 00:11:38 +0000 (19:11 -0500)]
r14821@dev (orig r4560):  lukes | 2008-07-08 19:11:38 -0500
fixed versioned stuff to strip BEGIN from sql files


Trivial merge