merge master (including some s11 patches)
authorStephen Compall <scompall@nocandysw.com>
Fri, 4 Sep 2009 18:37:24 +0000 (4 13:37 -0500)
committerStephen Compall <scompall@nocandysw.com>
Fri, 4 Sep 2009 18:37:24 +0000 (4 13:37 -0500)
Conflicts: restore `database-destroy' (accepted as spelling
correction, not API removal) and reorder MySQL includes and libs.


Trivial merge