merge zobel's version and mine
authorPeter Palfrader <peter@palfrader.org>
Thu, 17 Mar 2011 22:43:32 +0000 (23:43 +0100)
committerPeter Palfrader <peter@palfrader.org>
Thu, 17 Mar 2011 22:43:32 +0000 (23:43 +0100)

No differences found