merge of 'a17b5ac6bf09c1cfe29c784e2b1497684e1832ca'
authorRobert Schuster <thebohemian@gmx.net>
Wed, 20 Aug 2008 00:32:13 +0000 (00:32 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Wed, 20 Aug 2008 00:32:13 +0000 (00:32 +0000)
commit725ef6cdb7e45dd435c29540c1dda2a83c8c3b85
treef3ac547156af0413b29133d4c675e31f05b2c8c4
parent30180b8ef19dac735e61897b3b9e5d4fed284990
parent3507be1a6e90212487c6a3b914147d599edba8c3
Merge ... 'a17b5ac6bf09c1cfe29c784e2b1497684e1832ca'
     and 'b1c5c4bee3ccfe87f1e42ab909186c7db359dd0e'