Merge with master

This commit is contained in:
Sergi Mansilla 2011-02-03 16:14:06 +01:00
commit 9197bbdba9