Checkout
kostja
committed
on 19 Dec 07
Merging suitable for RC changes, done during development of Arbooz (watermarks for images)