fixed crash when CLocalizeStrings::Load() is called from multiple threads, which is possible when called by add-ons.
fixed, ANativeActivity is a struct, not a class
smartplaylists: fix parsing of sort direction from JSON object
Fix iso9660::ReadFile() to no longer read one sector past file size
droid: fixed largefile smb access
darwin: fix stray touch
[rbp/omxplayer] Fix build error in types for max

It seems there is a compile error when STDINT_H_AVAILABLE is not defined.
See: http://raspbmc.apt-get.eu/downloads/bin/xbmc/nightlies/xbmc-rbp-20130710.log
Merge pull request #2968 from popcornmix/fix_max_types

[rbp/omxplayer] Fix build error in types for max
fixed, add float to float convert with a copy so we do not have to check convertFn for null all over the place
changed, include AE_FMT_S16NE as avaliable format on audiotrack sink
changed, audiotrack, add volume/drain locks, default volume to 1.0, remove AE_FMT_S16NE handling
Proper fix: Limit to file size
Merge pull request #2951 from jmbreuer/upstream-diskuniqueid

Generate stable DVD disk IDs by performing CSS first
jsonrpc: fix bad if condition in CFooLibrary::FillFileItem
jsonrpc: ensure that "label" always contains at least the filename of a playing item
Prefer empty() over size()
Merge pull request #2975 from Fice/empty

Prefer empty() over size()
Include guilib/GraphicContext.h and don't assign NULL to int

Fixes: #14501
Merge pull request #2977 from smspillaz/fix-14501

Include guilib/GraphicContext.h and don't assign NULL to int
[configure] don't use relative include paths in addon headers
this breaks xbmc dev packages where all headers are installed in standard include paths