Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sun, 22 Jul 2007 14:18:20 +0000 (10:18 -0400)
committerDana Jansens <danakj@orodu.net>
Sun, 22 Jul 2007 14:18:20 +0000 (10:18 -0400)

Trivial merge