new trunk based on current 1.2
authoroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Wed, 23 May 2007 16:08:14 +0000 (16:08 +0000)
committeroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Wed, 23 May 2007 16:08:14 +0000 (16:08 +0000)
git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1073 a5681a0c-68f1-0310-ab6d-d61299d08faa


Trivial merge