more merging - hopefully all spare heads are now gone
authorPerttu Ahola <celeron55@gmail.com>
Wed, 1 Jun 2011 23:47:39 +0000 (02:47 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Wed, 1 Jun 2011 23:47:39 +0000 (02:47 +0300)

Trivial merge