merge with upstream
authorBernd Petrovitsch <bernd@firmix.at>
Fri, 13 Jun 2008 18:07:53 +0000 (20:07 +0200)
committerBernd Petrovitsch <bernd@firmix.at>
Fri, 13 Jun 2008 18:07:53 +0000 (20:07 +0200)
commitffa0c666105a6b23533191f60317fc461eedaaf2
tree80e876ae01508e01d6ea0810881d0059bb8e13ba
parent21baca2b29a58079f45f98f467018983ee8f09f5
parent6ce5e441f72bf136d09bfaee942ab6701abe625d
 merge with upstream