Merge commit 'dieterb/experimental'
authorPremysl 'Anydot' Hruby <dfenze@gmail.com>
Thu, 30 Apr 2009 15:45:09 +0000 (17:45 +0200)
committerPremysl 'Anydot' Hruby <dfenze@gmail.com>
Thu, 30 Apr 2009 15:45:09 +0000 (17:45 +0200)

Trivial merge