rclirc.cpp: add alternative the path to the socket
merge - xine-lib-1.2.2: Raise priority of FAAD audio plugin ahead of FFmpeg
merge - filepush: Don't use mmap (17-11-2011)
merge - eDVBUsbAdapter: fallback to dvb_frontend_info name
merge - servicedvb: fix bool/int mixup
merge - eDVBResourceManager: add 'system' parameter in canAllocateChannel
merge - servicedvb: small optimization
merge - InfoBarGenerics: fix zapping through a list of services with alternatives
merge - RecordTimer.py: fix when current played service is alternative
merge - Navigation.py: Introduce getCurrentlyPlayingServiceOrGroup
merge - Allow custom handling for background job completion
merge - ServiceScan: make summary labels translatable
merge - cosmetics (whitespace fixes)
merge - Positioner Setup: improved Autofocus for low symbol rates
merge - servicedvd changes
merge - subtitle: fix pts LSB, and slightly optimize extract_pts
merge - subtitle: fix closing brackets
merge - subtitle: undo HBO hack
merge - ecanvas: Add drawLine function
merge - REVERT: servicedvd changes