Merge commit 'martin/master'
authorMarko Kreen <markokr@gmail.com>
Thu, 4 Jun 2009 13:22:14 +0000 (16:22 +0300)
committerMarko Kreen <markokr@gmail.com>
Thu, 4 Jun 2009 13:22:14 +0000 (16:22 +0300)

Trivial merge