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

[Jan Horak]

commit bca099b4dd87c0c0366411455be0ac09f4a349a9
Merge: ea989e7 16f7721
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Oct 16 09:34:23 2012 +0200

    Merge branch 'master' into f17

 xulrunner.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---