Fri, 01 Sep 2006 12:56:37 +0000MERGE trunk -r528:534 -> branches/stable-1.1 (master version in Doxyfile) stable-1.1
Florian Pose <fp@igh-essen.com> [Fri, 01 Sep 2006 12:56:37 +0000] rev 1720
MERGE trunk -r528:534 -> branches/stable-1.1 (master version in Doxyfile)

Fri, 01 Sep 2006 12:35:41 +0000MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines) stable-1.1
Florian Pose <fp@igh-essen.com> [Fri, 01 Sep 2006 12:35:41 +0000] rev 1719
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)