merge of '2a9c44cdb5873b8f43feb32a28672dc98ff82666'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:50:20 +0000 (23:50 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:50:20 +0000 (23:50 +0000)
commit10bb92e04748af06ffc43c0cf9773de8a5e8914c
treeac8765673bd0d4332e6b3b65505a8d622a84bf78
parent570c4b81062fc43f021950e6449c1b0dd6d6c602
parenta8e1f7d7523ab5cd6154bc585cd90c1fd24f89dd
Merge ... '2a9c44cdb5873b8f43feb32a28672dc98ff82666'
     and 'dc0102fc89237b4da908e11a15fd36bef0dd2677'