Merge commit 'upstream/2008.1+svn1648'
commit1e37d4281ee90cefb1350fe491511f9dea8b846e
authorChristoph Egger <christoph@coders-nemesis.eu>
Sat, 3 Jan 2009 21:03:02 +0000 (3 22:03 +0100)
committerChristoph Egger <christoph@coders-nemesis.eu>
Sat, 3 Jan 2009 21:03:02 +0000 (3 22:03 +0100)
tree1c37c98b55db1d5c08ff79a44765ebfc893d8b75
parent342b90643f494fddbfe5d8c44a8b3e5f5f976db4
parent35122faef6d08ee275e592bb9acd86d921577ff1
Merge commit 'upstream/2008.1+svn1648'