Merge from master
authorJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Thu, 15 Apr 2010 10:52:23 +0000 (13:52 +0300)
committerJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Thu, 15 Apr 2010 10:52:23 +0000 (13:52 +0300)
commit78933620784c805ac4d00fd4091671d290b1f243
tree9ca4dbd75cd90b878d9a0f8d5da00f07460ced76
parent2e099c18914ac3c63396311b926e111735b0f852
parent59b6d1382c4a89a5c01dbd54f21ff4e3a89c1d79
Merge from master