Merge remote branch 'martin/master'
authorMarko Kreen <markokr@gmail.com>
Tue, 6 Oct 2009 15:01:23 +0000 (18:01 +0300)
committerMarko Kreen <markokr@gmail.com>
Tue, 6 Oct 2009 15:01:23 +0000 (18:01 +0300)

Trivial merge