Merge remote branch 'martino/master'
authorMarko Kreen <markokr@gmail.com>
Thu, 15 Dec 2011 08:31:31 +0000 (10:31 +0200)
committerMarko Kreen <markokr@gmail.com>
Thu, 15 Dec 2011 08:31:31 +0000 (10:31 +0200)

Trivial merge