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

Trivial merge