[drupal6-filefield/el5: 3/3] Merge branch 'el6' into el5