Remember to pass EXTRA_CFLAGS to C++ compiler also.
Merge branch 'master' of git://purkki/picoos.git