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

[Jan Horak]

commit ea989e77e0b46450d20a7a5ed8f4b7c5de4226cb
Merge: 302c10a bd4d14b
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Oct 16 08:39:56 2012 +0200

    Merge branch 'master' into f17

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