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

[Martin Stransky]

commit 13dae3867111560fd92e31782227a86920fb8d44
Merge: 60f88c2 92d7ca8
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Oct 18 10:51:49 2011 +0200

    Merge branch 'master' into f15

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