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

[Dennis Gilmore]

commit 4144f72afed91d27c867a7c92620bccb2168a620
Merge: 0827a5f 816acb4
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Jan 19 22:08:11 2012 -0600

    Merge branch 'master' into f15

 xulrunner.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---