[mozilla-adblockplus/f16: 11/11] Merge branch 'f15' into f16

[Russell William Golden]

commit c82fd8a7cef6447507702b522fc87b252297931a
Merge: a78f3de cf41072
Author: Russell William Golden <niveusluna at niveusluna.org>
Date:   Thu Jan 19 13:38:07 2012 -0600

    Merge branch 'f15' into f16
    
    Conflicts:
    	mozilla-adblockplus.spec
    
    See F15 stuff.

 firefox-9-compat.patch   |   16 ++++++++++++++++
 mozilla-adblockplus.spec |   10 ++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
---