Merge branch 'package' master
authorToni Jussila <toni.jussila@gmail.com>
Mon, 31 May 2010 09:15:13 +0000 (12:15 +0300)
committerToni Jussila <toni.jussila@gmail.com>
Mon, 31 May 2010 09:15:13 +0000 (12:15 +0300)

Trivial merge