merge of aa70f35e12bec75c0c43f7c69c41e959b5d83092
authorFelix Domke <tmbinc@elitedvb.ne>
Wed, 13 Sep 2006 16:11:02 +0000 (16:11 +0000)
committerFelix Domke <tmbinc@elitedvb.ne>
Wed, 13 Sep 2006 16:11:02 +0000 (16:11 +0000)
     and b8008aabce59082ac3d1ce2199f08f43bfd1c6da


Trivial merge