Merge branch 'master' into 3.4
authorDana Jansens <danakj@orodu.net>
Sat, 14 Jul 2007 13:19:47 +0000 (09:19 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 14 Jul 2007 13:19:47 +0000 (09:19 -0400)

Trivial merge