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

Trivial merge