merge of '414c6691b908eaab89fe4400b49ebf0e8d47aaad'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:43:18 +0000 (23:43 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:43:18 +0000 (23:43 +0000)
commitea83ce724eaa0cbb5caf93ee90c60a7c1f89feef
tree7814962955a52571764971c4eb12c090d7873c6f
parentc3360f247a6439638edfb05dea1848a9c8a540fb
parentd9aa48e8ac4c98bb5704445ccd6d3a8ed95984b5
Merge ... '414c6691b908eaab89fe4400b49ebf0e8d47aaad'
     and 'e17edbd4fcc354c30505a8c14cdc5944260864f7'