Merge branch 'master' into jskia73
authorJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Wed, 31 Mar 2010 09:53:29 +0000 (12:53 +0300)
committerJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Wed, 31 Mar 2010 09:53:29 +0000 (12:53 +0300)

Trivial merge