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

[Jan Horak]

commit 666385e5aab9413839edcd27e81db4eda55af72f
Merge: 84e7db2 51fbcb7
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Dec 20 16:10:07 2011 +0100

    Merge branch 'master' into f15

 sources          |    4 ++--
 thunderbird.spec |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---