Some rearrangements
Merge branch 'master' of github.com:ziutek/rrd