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

(cherry picked from commit bad63db8)

(cherry picked from commit feec0f30)

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 f3fe98db)

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

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 cbccd729)
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 1e7e2ae9)

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

(still some issues that I will fixe later on)

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Without this, ffmpeg refuses to build due to licensing problems.

(tested under Scratchbox-based public Beta SDK)