commit ea18a10cb2e12a976a892dca9379d3b62b2b11fc Merge: 9dcbd24 b158a60 Author: Mike Perry mikeperry-git@fscked.org Date: Tue May 1 15:47:56 2012 -0700

Merge branch 'maint-2.2' into maint-2.3

...-nsICacheService.EvictEntries-synchronous.patch | 44 ++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-)