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

[Jan Horak]

commit 54f67ed572abe71e5fa91ad99d0e6e27f3351953
Merge: f44eac2 684209c
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Nov 15 12:14:01 2011 +0100

    Merge branch 'master' into f15

 thunderbird-8.0-enable-addons.patch |   26 ++++++++++++++++++++++++++
 thunderbird-redhat-default-prefs.js |    2 ++
 thunderbird.spec                    |   19 +++++++++++--------
 3 files changed, 39 insertions(+), 8 deletions(-)
---