emanuele
Re-merged changes version specific since it doesn't make much sense to keep the separated when one of the two versions is broken due to images (there may be a better way)
emanuele commited 18c8051 at 2012-10-25 06:23:20