tree fbc1cb0ba6ee9b5b8e777407372f1e253820fa48
parent 60d96cd54cc0b3f38275a5ddb93ad868526719a4
author Christian Heimes <christian@cheimes.de> 1198015219 +0000
committer Christian Heimes <christian@cheimes.de> 1198015219 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release25-maint%4059555

Fixed merge glitch