Merge pull request #3265 from wsoltys/cleanup
authorwsoltys <wiso@xbmc.org>
Sat, 14 Sep 2013 22:55:36 +0000 (15:55 -0700)
committerwsoltys <wiso@xbmc.org>
Sat, 14 Sep 2013 22:55:36 +0000 (15:55 -0700)
some fixes in various files


Trivial merge