Merge commit 'martin/master'
authorMarko Kreen <markokr@gmail.com>
Mon, 8 Jun 2009 08:07:08 +0000 (11:07 +0300)
committerMarko Kreen <markokr@gmail.com>
Mon, 8 Jun 2009 08:07:08 +0000 (11:07 +0300)

Trivial merge