Merge remote branch 'upstream/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 5 Jan 2011 22:16:20 +0000 (23:16 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 5 Jan 2011 22:16:20 +0000 (23:16 +0100)
commit52552822386e10cc774352cf085ce5d772e9e010
treef3886c81a5e3c0ea6cbc9b79ed1919d16f66846d
parent0db63425d0358953a8bf3056fd3c0c0a9d182756
parentb4be1bb59c263388abc99a95f8f02e37f79f2530
Merge remote branch 'upstream/master'

Fixed conflicts:
project/VS2008Express/UnrarXLib.vcproj
project/VS2008Express/XBMC for Windows.sln
project/VS2008Express/XBMC.vcproj
project/VS2008Express/guilib.vcproj
project/VS2008Express/libPlatinum.vcproj