Merge commit 'askotm/master'
authorMarko Kreen <markokr@gmail.com>
Wed, 6 May 2009 10:36:20 +0000 (13:36 +0300)
committerMarko Kreen <markokr@gmail.com>
Wed, 6 May 2009 10:36:20 +0000 (13:36 +0300)

Trivial merge