Merge branch 'feature-option-o'
authorKai Dietrich <mail@cleeus.de>
Sun, 15 May 2011 18:45:38 +0000 (20:45 +0200)
committerKai Dietrich <mail@cleeus.de>
Sun, 15 May 2011 18:45:38 +0000 (20:45 +0200)

Trivial merge