Commit dde8f98366599f71b4608b2f3fb07171d8fab989

sammy 2008-04-12T23:55:53

* Merging [689].