Merge commit 'remotes/gitorious/master'
authorTuomo Tanskanen <tumi@tumi.fi>
Sun, 20 Dec 2009 19:25:05 +0000 (21:25 +0200)
committerTuomo Tanskanen <tumi@tumi.fi>
Sun, 20 Dec 2009 19:25:05 +0000 (21:25 +0200)

Trivial merge