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

[Martin Stransky]

commit 36349709f34a4ae444656a997e4216de4393c5a9
Merge: 4c36a10 94c27ee
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Oct 16 10:55:46 2012 +0200

    Merge branch 'master' into f18

 .gitignore     |    2 ++
 seamonkey.spec |    7 +++++--
 sources        |    4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
---