tipo
Merge branch 'unstable' of github.com:jmankiewicz/lughos into unstable

Conflicts:
	src/coolpak6000.cpp
io_service from outside the class