Merge with mozilla-central.
commitab1dc0f23b16c32183c5b0fa22f340cccebe32a6
authorDavid Anderson <danderson@mozilla.com>
Fri, 22 Aug 2008 23:38:43 +0000 (22 16:38 -0700)
committerDavid Anderson <danderson@mozilla.com>
Fri, 22 Aug 2008 23:38:43 +0000 (22 16:38 -0700)
treee7c26512c18ec427a79e190416df0913236d38a4
parentef59755f362ea2a278ff446c2462db57e0b73ba7
parent428babd48bc2450f652e592f107ae86b093dde46
Merge with mozilla-central.