merging patch from brendonh@taizilla.com. Nice work. Fixes #4500
merging patch from brendonh@taizilla.com. Nice work. Fixes #4500


git-svn-id: ee6e786acc44c9cca5ee17c71a5576c45c210361@10573 560b804f-0ae3-0310-86f3-f6aa0a117693

redaktor/deliteful