merged with upstream
authorMarcel Haerry <haerry@puzzle.ch>
Tue, 29 Apr 2008 08:00:06 +0000 (10:00 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Tue, 29 Apr 2008 08:00:06 +0000 (10:00 +0200)
commit78d0392d004986fbed9938e0ad994165fb8d51dd
tree2af64fd794dc3c9a1a2587db18669dc848339228
parent65fb027d8cf639c565b0f9fb53b5fbe9ee25dc7b
parenta043afef5e8fb14385f59b4fee558f7f9618b050
merged with upstream