merge with HEAD branch
authorHannes Gredler <hannes@gredler.at>
Sun, 6 Apr 2008 20:14:29 +0000 (22:14 +0200)
committerHannes Gredler <hannes@gredler.at>
Sun, 6 Apr 2008 20:14:29 +0000 (22:14 +0200)

Trivial merge