merge of '13530e1cbba5e3db86e8ea9713ffcf460f77b92c'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 1 Aug 2008 00:37:05 +0000 (00:37 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 1 Aug 2008 00:37:05 +0000 (00:37 +0000)
commit923282dc0cd12ba539c648535c12d96f3476c2a9
tree7d6ec8d4f00cc60a8f146c720935bf3cea03d10d
parent40e88ecdd50759429df7f3cab05731558368664b
parent9f8e3f99fa335bd4ee9ecaa8823b7dc0f299c9b9
Merge ... '13530e1cbba5e3db86e8ea9713ffcf460f77b92c'
     and 'b70c18ddb17c1721c0c521628f96624b1a6bef2b'