Merge remote branch 'martin/master'
authorMarko Kreen <markokr@gmail.com>
Fri, 27 Nov 2009 09:59:04 +0000 (11:59 +0200)
committerMarko Kreen <markokr@gmail.com>
Fri, 27 Nov 2009 09:59:04 +0000 (11:59 +0200)

Trivial merge