[drupal6-auto_nodetitle/el5/master: 2/4] Merge branch 'master' into el5

[Peter Borsa]

commit 42a30748c7342f458336fff8243867e09372ac3e
Merge: 95be49d 1cf282b
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Wed Jan 26 23:05:49 2011 +0100

    Merge branch 'master' into el5

---