Merge branch 'arnied-clockchange' into intranator-next
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 3 Feb 2009 11:27:11 +0000 (12:27 +0100)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 3 Feb 2009 11:27:11 +0000 (12:27 +0100)

Trivial merge