[drupal6-filefield/el5] (3 commits) ...Merge branch 'el6' into el5