Merge branch 'testing' into development
Merge branch 'development' into testing
Fix comments
Revert "Fix comments"

This reverts commit fe95f232f32c73592e6429c13d28d3dfc9f216d8.
fix comments
Added BoxeeBox lirc socket location to startup of xbmc.
Merge pull request #13 from jlagerweij/lircSupport

Added BoxeeBox lirc socket location to startup of xbmc.
Merge remote-tracking branch 'upstream/master'
Merge branch 'testing'