merge from devel:
Tomas Janousek • 17 years ago