Merge commit 'upstream/master'
authorMartin Pihlak <martin.pihlak@gmail.com>
Mon, 19 Jul 2010 07:12:41 +0000 (10:12 +0300)
committerMartin Pihlak <martin.pihlak@gmail.com>
Mon, 19 Jul 2010 07:12:41 +0000 (10:12 +0300)

Trivial merge