Merge branch 'upstream'
commit4978bfcb62e04f13dba49210e44d1d3689d24c07
authorDmitrijs Ledkovs <dmitrij@samara.(none)>
Wed, 21 Jan 2009 17:06:41 +0000 (21 17:06 +0000)
committerDmitrijs Ledkovs <dmitrij@samara.(none)>
Wed, 21 Jan 2009 17:06:41 +0000 (21 17:06 +0000)
tree252e16c8d72655de764b9c45759b8a658e96702a
parent297d6c28fda1233c94cfdb133b83ad1a863cda25
parent294b9583894f3642a0d2e45e39ccdf51a7cc9e6a
Merge branch 'upstream'