Merge remote-tracking branch 'martino/master'
authorMarko Kreen <markokr@gmail.com>
Wed, 15 Aug 2012 12:02:15 +0000 (15:02 +0300)
committerMarko Kreen <markokr@gmail.com>
Wed, 15 Aug 2012 12:02:15 +0000 (15:02 +0300)

Trivial merge