[thunderbird/f15: 2/2] Merge branch 'master' into f15

[Jan Horak]

commit 9ad6e0831de07b1e6c2e2bc19e443df7cb27ef0d
Merge: 768b466 4689973
Author: Jan Horak <jhorak at redhat.com>
Date:   Fri Dec 2 16:17:19 2011 +0100

    Merge branch 'master' into f15

 mozilla-696393.patch |   78 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 2 deletions(-)
---