merge of 'ad0c1c90501edf142b7f2f658fe2c819ce9e0608'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 21 Dec 2007 08:24:03 +0000 (08:24 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 21 Dec 2007 08:24:03 +0000 (08:24 +0000)
commit4753dacf2ed2111b1cc7b9b5d7c877b70a60b224
tree6b6dc7b86ee765655c6d408256a72f271bb234b4
parent642b1a18b2e3fbaeed7c505d29b3e1f2f5c3e5ce
parentc6150944b250086c0375b86ce819a8b9bf9d2820
Merge ... 'ad0c1c90501edf142b7f2f658fe2c819ce9e0608'
     and 'd8704c548ce3f4b681847003a642608d26644766'