[xulrunner/f17: 2/2] Merge branch 'master' into f17

[Jan Horak]

commit db9ec536dacae988c09c1fa29e4801267aa0cccd
Merge: 4ad0003 795c85d
Author: Jan Horak <jhorak at redhat.com>
Date:   Fri Oct 26 10:58:22 2012 +0200

    Merge branch 'master' into f17

 .gitignore     |    1 +
 sources        |    2 +-
 xulrunner.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---