Merge branch 'combine'
authorMichael M Slusarz <slusarz@curecanti.org>
Mon, 26 Oct 2009 18:33:41 +0000 (12:33 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Mon, 26 Oct 2009 18:33:41 +0000 (12:33 -0600)

Trivial merge