Merge ../master/
authorMichal Simek <monstr@monstr.eu>
Sun, 14 Oct 2007 12:31:47 +0000 (14:31 +0200)
committerMichal Simek <monstr@monstr.eu>
Sun, 14 Oct 2007 12:31:47 +0000 (14:31 +0200)

Trivial merge