Blocked revisions 74152,74173 via svnmerge

........
  r74152 | benjamin.peterson | 2009-07-21 19:03:43 -0500 (Tue, 21 Jul 2009) | 1 line

  simplify
........
  r74173 | benjamin.peterson | 2009-07-22 11:34:37 -0500 (Wed, 22 Jul 2009) | 1 line

  revert r74152
........