Merged revisions 1917-2036 from trunk.

tbrehm

2010-09-26 89e4554cb0bbf4b515f1e9f4ec6d48d0a95706c5

server/conf/index/.htaccess does not exist in tree 61336f708c179e10497c785bad78874436d93060