Merge remote branch 'libcec-public/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 14 May 2012 18:32:28 +0000 (20:32 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 14 May 2012 18:32:28 +0000 (20:32 +0200)
commitcc938f166e50b0c9e4fdccf55e0a8cffb2c56602
treead2b561f98b322891a91d0bcf14c22bcaa1bf3d9
parent679dfa075ef915793de454b2f803ce8fe09d30b4
parent5806561ef938c6201adf4dccb3f80cebb1aa215b
Merge remote branch 'libcec-public/master'

Conflicts:
src/lib/platform/threads/threads.h
src/lib/platform/threads/threads.h