[locale] OSX is built with 'generic' support for stdc++ locale(). Fixes issues with unicode characters not uppercasing (e.g. the 'Videos' label in French on Confluence home screen).
[Peripheral] Use per-device iMON setting instead of system-wide setting.
AE: don't disable devices - as detection does not work reliable
pvr: new advanced setting that allows marking channel icons populdated by auto scan as "user-set".
fixed: Make sure when creating a tiled thumbnail at least one image loads properly
fixed: Ignore extension case when checking for our jpeg loader + also consider .jpeg files
Merge pull request #1925 from arnova/picture_thumb_fixes

Picture thumb fixes
[nfs] - we need to hold the lock for the keepalive list during the whole keepalive process and we have to remove a filehandle from the list before closing it (else there would be a race where the keepalive could access a already closed filehandle bammm).
[nfs] - we need to refresh the last accessed time of the used context aswell when we reset the filehandle last accessed time. There was a race with PAPlayer where track1 was still opened and the context was nearly timed out - then track2 got opened shortly before track1 was closed and requested the context which was now timed out already - so the open of track2 destroyed the context and created a new one - now track1 was read again with the already destroyed context - booom.
[pvr] Use play count and resume point information from the PVR client if available.
Merge pull request #1779 from fritsch/xbmc-upstream

AE: don't hide ALSA HDMI devices based on missing ELD data - it does not work reliably enough
jsonrpc: fix crash on empty "params" parameter in Addons.ExecuteAddon (fixes #13729)
Merge pull request #1926 from axmhari/pvr-watched-fix

[pvr] Use play count and resume point information from the PVR client if available.
[pvr] bump pvr add-ons to 1409bbaa9248646372cf5c838def8c49c90e6e11 for Frodo RC2
Merge pull request #1923 from nemphys/pvr-channels-userset

pvr: new advanced setting that allows marking channel icons populated by auto scan as "user-set"
Merge pull request #1927 from opdenkamp/pvr-addons-rc2

[pvr] bump pvr add-ons
fixed: If player wasn't playing at normal speed while selecting a new item, the play speed would not properly be reset to normal
Merge pull request #1536 from Karlson2k/Imon_addition_01

Replace system-wide iMON setting with per-device setting
Merge pull request #1928 from arnova/paplayer_seek_fix

fixed: If player wasn't playing at normal speed while selecting a new it...
addons: fix possible deadlock which causes exit to fail

If an PVR addon has ever lost its connection, there's a race condition that can
cause the thread to never die, and we deadlock when trying to exit XBMC. This
should probably be fixed somewhere in threading so that the GetPriority() and
SetPriority() calls are safer, but in this case we'll just make sure that the
thread is running when we call it.

The underlying problem is that SetPriority() waits on the thread-start event,
which is in a weird state if the thread is set to auto-delete and it has a very
short life-span. In that case, the event never shows as signaled in
SetPriority(). As a result the calling thread waits forever for the ghost
thread to start, and hangs there forever.