sml/temi-branch
  root revision: r3005 (2008-4-25)
  merge from trunk -r 3005:3101 (2008-7-14) commited as 3102
  merge from trunk -r 3102:3115 (2008-7-16) commited as 3116
  merge from temi-branch into trunk -r 3005:3115 (2008-7-16) commited as 3117
