fix conflicts during merge of Arun's tree
[phpfspot.git] / smarty_cache / .hidden