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

[Peter Robinson]

commit 2ead2a74a0de9002797a5b2d9cc0cc110e7861fd
Merge: 3d0df2a 4a6f9f8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Dec 24 10:20:35 2011 +0000

    Merge branch 'master' into f15

 xulrunner.spec |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)
---