merge of '7d22e72b69f8f66fb6c9a1517dd341b70559cfc7'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:49:56 +0000 (23:49 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:49:56 +0000 (23:49 +0000)
commit570c4b81062fc43f021950e6449c1b0dd6d6c602
treef0dfabf4a3d2246a3a0d3a35a963fd44c158cdac
parentde7bcfef852d62482f776453472de653cbec2f4b
parentea83ce724eaa0cbb5caf93ee90c60a7c1f89feef
Merge ... '7d22e72b69f8f66fb6c9a1517dd341b70559cfc7'
     and 'c82c3d791987b7feb095d7b6b0c12a52eef72fb0'