[arch-projects] merging for 1.4.0

[Paul Mattal]

Loui wrote:
> On 9/26/07, Paul Mattal <paul at mattal.com> wrote:
>> Thanks. It's great to have such a hard-working team contributing so
>> much! We're really going to make some serious strides with this release.
>>
> Yeah! We better! Anyhoo I've made some nice clean commits off of the
> testing branch. Pull em out and I'll do some more! I don't want to get
> too ahead of myself now and get a possibility of escalating merge
> conflicts :D

Merged. Thanks!

The only tricky bit was making sure we rewrite the config.inc file. I'll 
have to make sure I do that when we roll out.

- P