Merge remote-tracking branch 'sfan5/apple-trees'
authorPerttu Ahola <celeron55@gmail.com>
Fri, 16 Sep 2011 16:09:13 +0000 (19:09 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Fri, 16 Sep 2011 16:09:13 +0000 (19:09 +0300)

Trivial merge