Merge branch 'praet'
[nmbug-tags.git] / tags / 1327909550-6788-1-git-send-email-pieter@praet.org / obsolete