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

[Christopher Aillon]

commit 530850fef43f232fb24450313dc952830f417ae9
Merge: b1ded05 7c370ad
Author: Christopher Aillon <caillon at redhat.com>
Date:   Fri Mar 18 10:01:34 2011 -0700

    Merge branch 'master' into f15
    
    Conflicts:
    	thunderbird-mozconfig
    	thunderbird.spec

 thunderbird-mozconfig |    2 ++
 thunderbird.spec      |   11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
---