Merge 66117 from /trunk
r66117 | jhunold | 2010-10-20 17:56:49 +0200 (Mi, 20 Okt 2010) | 2 lines
do not clear flags already set by common.handle-options in init()