Merge branch 'v5-devel' into v5-devel-tmp
authorRainer Gerhards <rgerhards@adiscon.com>
Thu, 12 Jan 2012 03:08:22 +0000 (04:08 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Thu, 12 Jan 2012 03:08:22 +0000 (04:08 +0100)

Trivial merge