merge last 2 day's changes to trunk (trunk will be for devel for now on, stable is /branches/stable/)


git-svn-id: http://observium.org/svn/observer/trunk@4564 61d68cd4-352d-0410-923a-c4978735b2b8