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)
commitd32c077bf6c373abd1c9dc7b9539359c25123e81
treeb725765daf6b72a74940dd72b9db39f3aeacec92
parentb2d6484598e2e9a023457c0658ddce3d2203016e
parented5c4cf44d0b38e129ad57747dfaf16d9677d465
Merge commit 'ed5c4cf44d0b38e129ad57747dfaf16d9677d465'