Gregory Szorc ddaecc3b88 Merge mozilla-central into build-system ...

Only conflict was configure.in amd was due to context, not
changed lines themselves.

2013-02-25 22:09:18 -08:00

..

aurora

Merge mozilla-central into build-system

2013-02-25 22:09:18 -08:00

nightly

Merge mozilla-central into build-system

2013-02-25 22:09:18 -08:00

official

Merge mozilla-central into build-system

2013-02-25 22:09:18 -08:00

unofficial

Merge mozilla-central into build-system

2013-02-25 22:09:18 -08:00