merge Onyx-Citrus to 3.4 working
authorDana Jansens <danakj@orodu.net>
Sat, 9 Jun 2007 02:55:18 +0000 (02:55 +0000)
committerDana Jansens <danakj@orodu.net>
Sat, 9 Jun 2007 02:55:18 +0000 (02:55 +0000)

Trivial merge