Merge commit 'priit/master'
authorMarko Kreen <markokr@gmail.com>
Wed, 29 Apr 2009 08:50:58 +0000 (11:50 +0300)
committerMarko Kreen <markokr@gmail.com>
Wed, 29 Apr 2009 08:50:58 +0000 (11:50 +0300)

Trivial merge