Merge branch 'ramosam' into juksa_local
authorJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Mon, 29 Mar 2010 10:56:10 +0000 (13:56 +0300)
committerJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Mon, 29 Mar 2010 10:56:10 +0000 (13:56 +0300)

Trivial merge