merge of '187416af25eba4fe476e378c52987bbc1e156cc8'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 21 Sep 2008 14:04:25 +0000 (14:04 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 21 Sep 2008 14:04:25 +0000 (14:04 +0000)
     and '7b4883000de7f9e1688f6fcde7bdd3f8b0e548c2'


Trivial merge