merge of '6932b153dae1ecb649cc4e5d6557adc86452c225'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 29 Aug 2008 10:21:15 +0000 (10:21 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 29 Aug 2008 10:21:15 +0000 (10:21 +0000)
     and '781cbce338e36c4834536a980b1d3c39b24b6860'


Trivial merge