Merged changes on `common.[ch]' from quota-branch to trunk