Merge remote-tracking branch 'intgit/master'
authorMarko Kreen <markokr@gmail.com>
Tue, 9 Oct 2012 08:48:30 +0000 (11:48 +0300)
committerMarko Kreen <markokr@gmail.com>
Tue, 9 Oct 2012 08:48:30 +0000 (11:48 +0300)

Trivial merge