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)

Trivial merge