(cherry picked from commit ca17039cd8dbaff98d0d4f08b94d3f3efa92af98)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 1692e7000a5639bb70d1d48b761ee40707ddc560)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit a037a08d58e5b97af4ec09071818126fd581b27f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit cbe9981163a222b2e57ad266881750fdf6b5d2b2)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit bc3883a52ee35d2d118f8a7c43093faa253cc0b4)

(cherry picked from commit 02b581e1dc54e8fe7c3ca6d24528539fd996ac13)

(cherry picked from commit b5687139f9ac84a7bdf03d9a9612950c43fe6ec2)

Mention that MPRIS is at version 1.0
Remove some trailing spaces
Remove unused argument 'lock' from MarshalStatus()
(cherry picked from commit f193adfbec380ac312c2f1a476a38e3172b7e993)

(cherry picked from commit bad63db868d59b72dfc48ab767e5ee74f4d5d3c6)

(cherry picked from commit feec0f30c55220f3f0be73940899f036cc72c012)

Fix mozilla autoconf check : AC_PATH_PROGS() was used incorrectly, and the check wouldn't error if {mozilla,seamonkey}-config or xulrunner wasn't found
(cherry picked from commit f3fe98dbb4255e70fec8f12c5bba44749122930b)

Lots of strings still missing, help would be welcome
(cherry picked from commit 946eba4adf89f4727dcecf84e20cf8cf98110cb4)

playlist sorting: for inline to work, the text has to be available. IE putting the function behind all others that use it isn't going to work, and marking forward declarations inline won't help fix it.

Fix compilation

(cherry picked from commit cbccd7297c241830e796f0f239b4b90d19c16c75)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

No need to backport this, as 1.0-bugfix only includes classic nibs

"daemon" is kept as the default, other accepted values are for now
"user" and "local0" through "local7"

Conflicts:

	modules/access/qtcapture.m

Seperate config options from the configtree. VLCTreeItem and VLCTreeLeafItem
are now used for CONFIG_ITEM in an options collection. It now works, but
probably should be cleanup up a bit more, with better seperation between the
disjunct elements of Tree and ConfigItems.

This was broken since [09e31e1436ef3e670bd7497688272dd073c8d3a6]
(cherry picked from commit 1e7e2ae9ec537a381837da841fdba793f15e412f)

set/(re)move a few cases of set_category and set_subcategory
(cherry picked from commit c18234129799ab96dec1b1d45373d3f0d5dd9bf3)