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

[Martin Stransky]

commit 0f2909c4ffc8a94c20c25e7a7463e7fbb9846cde
Merge: 5c603fd b20671c
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Nov 6 15:29:32 2012 +0100

    Merge branch 'master' into f17

 rhbz-872752.patch |   22 ++++++++++++++++++++++
 xulrunner.spec    |    7 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---