Merge branch 'sgen-stage-finalize'
authorMark Probst <mark.probst@gmail.com>
Thu, 12 May 2011 21:54:36 +0000 (23:54 +0200)
committerMark Probst <mark.probst@gmail.com>
Thu, 12 May 2011 21:54:36 +0000 (23:54 +0200)

Trivial merge