[MERGE] Content filtering (EOL part 2 of 3)

[Ian Clatworthy]

Ian Clatworthy wrote:

> Updated patch and incremental diff attached.

Updated patch attached after merging bzr.dev r3564 into this branch.

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: content-filters-4.patch
Type: text/x-diff
Size: 72003 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080718/20a5ceb8/attachment-0001.bin