merge master MOZILLA_1_9_1_BRANCH
authorRobert Kaiser <robert@notebook.(none)>
Sun, 31 Jan 2010 20:04:52 +0000 (21:04 +0100)
committerRobert Kaiser <robert@notebook.(none)>
Sun, 31 Jan 2010 20:04:52 +0000 (21:04 +0100)

Trivial merge