merge of '03a6d73778554bdbea429845e2f717d7a2beb2f3'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 3 Jan 2008 01:00:42 +0000 (01:00 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 3 Jan 2008 01:00:42 +0000 (01:00 +0000)
commit6cc8d18c134d775a13a36b4af7f58ee5ac01b602
tree4d4f132cb68f3a484981be65a42a4d0bb6c26802
parentafb011e6080e2e41108ec6b0530a102de6765e83
parentc9b6d5303ed4cc5128fcbe9712f764ca5e07b55e
Merge ... '03a6d73778554bdbea429845e2f717d7a2beb2f3'
     and 'de9cd407cd0ce372b951a6d6982f2d16a44dd95b'