Import from version 4


git-svn-id: file:///home/gallir/meneame/svn/src@4088 cbe1a1ec-7179-4919-8e32-4551e8279a00