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

[Jan Horak]

commit 3d0df2a1f1312af38f9c5eb7fd29f840857df5d0
Merge: 01d88c4 0f1f40e
Author: Jan Horak <jhorak at redhat.com>
Date:   Fri Dec 23 11:45:20 2011 +0100

    Merge branch 'master' into f15

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