[seamonkey/f18: 4/4] Merge branch 'master' into f18

[Martin Stransky]

commit 4c36a10aaa381ceef105ac799e80672c11babd98
Merge: ea758b6 4359865
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Wed Oct 10 10:11:16 2012 +0200

    Merge branch 'master' into f18

 .gitignore          |    2 +
 seamonkey-mozconfig |    4 +--
 seamonkey.spec      |   52 +++++++++++++++++++++++++++++++++++++-------------
 sources             |    4 +-
 4 files changed, 43 insertions(+), 19 deletions(-)
---