Merge remote branch 'mpihlak/master'
authorMarko Kreen <markokr@gmail.com>
Thu, 13 Jan 2011 13:58:56 +0000 (15:58 +0200)
committerMarko Kreen <markokr@gmail.com>
Thu, 13 Jan 2011 13:58:56 +0000 (15:58 +0200)

Trivial merge