Merge commit 'upstream/2008.1+svn1656'
commitb42459617d314efa04774920e33e910f61b018ab
authorChristoph Egger <christoph@coders-nemesis.eu>
Sun, 4 Jan 2009 17:05:42 +0000 (4 18:05 +0100)
committerChristoph Egger <christoph@coders-nemesis.eu>
Sun, 4 Jan 2009 17:05:42 +0000 (4 18:05 +0100)
tree5b292b49aedc4585773b5e3447af8be4b637f8a5
parent7c8373bb9eabb521544494b3287912d103846528
parent422185114b4b6a24d44521eb650258fa7ac4fe15
Merge commit 'upstream/2008.1+svn1656'