Merge remote-tracking branch 'intgit/master'
authorMarko Kreen <markokr@gmail.com>
Tue, 25 Oct 2011 12:44:59 +0000 (15:44 +0300)
committerMarko Kreen <markokr@gmail.com>
Tue, 25 Oct 2011 12:44:59 +0000 (15:44 +0300)

Trivial merge