Merge branch 'master' into newprefs
authorMichael M Slusarz <slusarz@curecanti.org>
Wed, 7 Apr 2010 16:36:25 +0000 (10:36 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Wed, 7 Apr 2010 16:36:25 +0000 (10:36 -0600)

Trivial merge