Merge branch 'uncontroversial' of russ@git.acceleration.net:/var/git/clsql into accel
authorRuss Tyndall <russ@acceleration.net>
Mon, 5 Oct 2009 15:16:54 +0000 (11:16 -0400)
committerRuss Tyndall <russ@acceleration.net>
Mon, 5 Oct 2009 15:16:54 +0000 (11:16 -0400)

Trivial merge