[xulrunner/f16: 3/3] Merge branch 'f16' of ssh://pkgs.fedoraproject.org/xulrunner into f16

[Jan Horak]

commit 67e28b04067b4a9de118e14ea412f29e75536378
Merge: f4329e2 8737016
Author: Jan Horak <jhorak at redhat.com>
Date:   Wed Dec 7 13:16:18 2011 +0100

    Merge branch 'f16' of ssh://pkgs.fedoraproject.org/xulrunner into f16
    
    Conflicts:
    	xulrunner.spec

---