Merge branch 'strip_names_and_args'
Florian Ragwitz [Sun, 24 May 2009 15:15:09 +0000 (17:15 +0200)]
* strip_names_and_args:
  Fail hard if strip_names_and_args fails.
  Add strip_names_and_args


Trivial merge