Merge remote-tracking branch 'origin/master'
authorStefan Sauer <ensonic@users.sf.net>
Mon, 2 Apr 2012 21:01:17 +0000 (23:01 +0200)
committerStefan Sauer <ensonic@users.sf.net>
Mon, 2 Apr 2012 21:01:17 +0000 (23:01 +0200)

Trivial merge