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

[Peter Robinson]

commit e3c414aab24f24cd915bcce7ff19175a87621be0
Merge: ba8e69b d571e82
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Dec 13 18:29:34 2012 +0000

    Merge branch 'master' into f17

 .gitignore     |   44 ++------------------------------------------
 xulrunner.spec |   10 +++++++---
 2 files changed, 9 insertions(+), 45 deletions(-)
---