* steve.alexander@canonical.com/launchpad--devel--0--patch-28 merge from rocketfuel
* steve.alexander@canonical.com/launchpad--devel--0--patch-29 merge from rocketfuel
* steve.alexander@canonical.com/launchpad--devel--0--patch-30 Improved debugging-on/off make targets. Made stubs included by default, and sql as overriding stubs.