Merge commit 'martin/master'
authorMarko Kreen <markokr@gmail.com>
Tue, 21 Jul 2009 11:19:50 +0000 (14:19 +0300)
committerMarko Kreen <markokr@gmail.com>
Tue, 21 Jul 2009 11:19:50 +0000 (14:19 +0300)
commit3ba07639abde6e54cf7e9959710195b4ef8c509b
treee45497f20ae72d18561f945810fad7f2a821bad9
parent06fde6435d13253965cd962984f4ee57ff75da84
parent9819f0ff600dd95faeedb7bedd80ee04f31c1463
Merge commit 'martin/master'