Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 19:53:15 +0000 (15:53 -0400)
committerDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 19:53:15 +0000 (15:53 -0400)

Trivial merge