Stop disabled muxes being re-added to the scan list on startup.
(cherry picked from commit 72d90ee2cd23e076aef39a6f5c0547d538258e29)
Don't have code with side effects in assert()

Including code with side effects in assert() is bad because
it won't be executed if compiled with NDEBUG
(cherry picked from commit cd52d7c2169f85b7bbfface42bff8f451d8f9929)
Plug some memory leaks
(cherry picked from commit c8e56a2865b3fea681511910f7764a6b27e57749)
Don't pass uninitialized mem to epoll_ctl()
(cherry picked from commit 2ac1b249df62a5ba6220ea3e428b09d41b61fc37)
Added quantal and removed hardy from latest dev builds.
(cherry picked from commit f83df17715d88a92e6b094d6321629597030c805)

Conflicts:

	support/launchpad-ppa
Fix #1367 - Add protection to stop opentv crashing on bad title descriptor.
(cherry picked from commit d761985f3b6c0002e5d4f39c6ded3d00a0d57ed9)
Fix mistake in dd_progid parsing.
(cherry picked from commit 6b2429bad7d275676084c1eb2baa810f6273a22d)
Fix #1352 - check return value of setuid/setgid calls.

Also slightly changed the logic so its possible to fork as non-root, though
you must explicitly list your username and group with -u and -g as I do not
want to break built in defaults for compatibility.
(cherry picked from commit a3a917cc2947822abd09f57bbabe4620f2b4271c)
Fix #1226 - remove block to creating empty channels.
(cherry picked from commit 31b1d5b57d0148bad30861f74ba10b3f385a9a73)
Fix #1355, #1356 - Fix problem with DVR dup detect.

I have completely removed global duplicate detection at this stage until
such time as I can do things properly. This means a user can ALWAYS manually
override and force a recording of a show.

For now duplicate detection only exists within the context or a series
link. So it will only record the "first?" instance of a given episode in
a give series link.

This is still a bit of a hack until I provide the user with the ability
to control the configuration and implement all the hooks properly.
(cherry picked from commit fbe2db07101806acdfe9a667ff9daf6766b1a199)
Fix #1377 - check for EOVERFLOW when reading from DVB device.

This can be returned as a result of a failure to read quickly enough from
the DVR device. This appears to happen quite regularly on channel zap for
certain cards. It's non-fatal and the system will auto recover immediately.

For now I've left the exit on other error in, but have added an error
message so we know its happening (the biggest problem was this was happening
silently before).

This may also relate to #1134, so might be worth back porting to 3.2.
(cherry picked from commit 03ff9727564d991b40e0f0fb0bb3ea06d00d8e65)
HTSP: Handle partial write()s
(cherry picked from commit d5deb9d19d57feef8acf25df2877539b4af0d39a)
Fix #1332 - add support for Ku Band lnb with lof 11300 KHz.
(cherry picked from commit ab422204c80f95346a7e7a6ba50fe1fe5b8b725b)
h264parser: Treat SPS and PPS id as unsigned

There is a change of crash otherwise if we get a corrupt bitstream
(cherry picked from commit 0d8d8a2da1412476bf8df409fe7c06e2af498c32)
[memleak] Plug memory leak in epggrab config handling
(cherry picked from commit 2ef7dac5971401e536e002d6bc61638c5d55923e)
[memleak] Plug memory leak in service destruction
(cherry picked from commit 9338b9529e2ee4b69640887c5998d6ee2cca8601)
[memleak] Plug possible memleak when stream content changes
(cherry picked from commit a2cf987afa2b3c56c71b48ab507df5d485ed37be)
Fix mistake in EPG episode numbering serialisation.
(cherry picked from commit 7a7f57072d7576a754d98441530ba8d0f8dce8a0)