Merge pull request #3832 from wsoltys/fixes
authorwsoltys <wiso@xbmc.org>
Mon, 16 Dec 2013 18:37:40 +0000 (10:37 -0800)
committerwsoltys <wiso@xbmc.org>
Mon, 16 Dec 2013 18:37:40 +0000 (10:37 -0800)
set of small fixes


Trivial merge