merge of '38476bfe431d934d649d515b180a82ed3e550822'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 2 Oct 2008 09:26:22 +0000 (09:26 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 2 Oct 2008 09:26:22 +0000 (09:26 +0000)
commit88c545e13bae1ce89a9809f289a01b57b19a02fe
tree9c29b54e2a22705032bdf0cfac37df06c6e02e94
parentc4ffde1c9fa5cbabc872f2d1422a101551d1677d
parente55d046fe8273d66a62ed55d1d971df1a2d023b6
Merge ... '38476bfe431d934d649d515b180a82ed3e550822'
     and '4fe9c4e8b248a850a5ab4ace667e3bade4448505'