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)
commitec5b52446a550a87b371fa11e0f3e662ea3c31ec
tree2a5e18115314bf9a3b90d3a1c8a3e6e5afee2baf
parent050eab735934d2c9a584eb0f1406548847a4ebfc
parent53769fbc13981ef4b97f54fd5abf872a1d380cb6
Merge commit 'upstream/master'