Merge commit 'martin/master'
authorMarko Kreen <markokr@gmail.com>
Tue, 21 Jul 2009 11:19:50 +0000 (14:19 +0300)
committerMarko Kreen <markokr@gmail.com>
Tue, 21 Jul 2009 11:19:50 +0000 (14:19 +0300)

Trivial merge