Merge branch 'master' of git://github.com/a11599/xbmc into a11599-master
authorJonathan Marshall <jmarshall@never.you.mind>
Fri, 25 Mar 2011 22:54:55 +0000 (11:54 +1300)
committerJonathan Marshall <jmarshall@never.you.mind>
Fri, 25 Mar 2011 22:54:55 +0000 (11:54 +1300)
* 'master' of git://github.com/a11599/xbmc:
  Enable saving scaling method per video.


Trivial merge