merge r118602, r118603 from trunk to fix tracemode test
merge r118602, r118603 from trunk to fix tracemode test


git-svn-id: a2a243ce800a9077e98f7b08a46d1bc10c0946e0@118604 d073be05-634f-4543-b044-5fe20cf6d1d6

Rudloff/linuxports,Rudloff/linuxports,Rudloff/linuxports