Code

Merged branch 'rrdtool-1.4.7-2.1'.