Merge commit 'upstream/0.5'
commitdd3404e0392eb10e9ca21ddc040e809d9eb91288
authorDmitrijs Ledkovs <dmitrij.ledkov@gmail.com>
Fri, 12 Dec 2008 02:11:58 +0000 (12 02:11 +0000)
committerDmitrijs Ledkovs <dmitrij.ledkov@gmail.com>
Fri, 12 Dec 2008 02:11:58 +0000 (12 02:11 +0000)
tree26b276a105bbebc46438e0675e7dabf2de3dacca
parent567dee9331269a75c7745c1b967a52eeb3283c4c
parentdae9dbc218ad05b89d5425f6cd2080a6719ad440
Merge commit 'upstream/0.5'