Merge commit 'ed5c4cf44d0b38e129ad57747dfaf16d9677d465'
authorPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:21:15 +0000 (14:21 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:21:15 +0000 (14:21 +0100)

Trivial merge