Merge branch 'origin'
authorRobert Kaiser <kairo@kairo.at>
Fri, 22 Oct 2010 13:25:51 +0000 (15:25 +0200)
committerRobert Kaiser <kairo@kairo.at>
Fri, 22 Oct 2010 13:25:51 +0000 (15:25 +0200)

Trivial merge