Merge branch 'next'
authorGerald Van Baren <gvb@unssw.com>
Tue, 23 Oct 2012 00:42:09 +0000 (20:42 -0400)
committerGerald Van Baren <gvb@unssw.com>
Tue, 23 Oct 2012 00:42:09 +0000 (20:42 -0400)

Trivial merge