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

[Martin Stransky]

commit 40d90db367aac297f65eaa8c6a21837321deaa22
Merge: e133a19 7dba846
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Oct 11 14:00:35 2012 +0200

    Merge branch 'master' into f17

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