Merged libavg_lock_guards branch

git-svn-id: https://www.libavg.de/svn/trunk/libavg@9403 44470bb9-56e9-0310-a0f8-c586564d3dc6