merged an old head into main branch
authorPerttu Ahola <celeron55@gmail.com>
Wed, 1 Jun 2011 23:46:38 +0000 (02:46 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Wed, 1 Jun 2011 23:46:38 +0000 (02:46 +0300)

Trivial merge