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

[Martin Stransky]

commit 253eee6edc4f3dfe8ea902e7d10869cec1bc73d6
Merge: 89f434e d9a05c1
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Oct 29 20:59:20 2012 +0100

    Merge branch 'master' into f18

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