Vadim Pisarevsky 2fd1e2ea57 merged all the latest changes from 2.4 to trunk		2012-04-13 21:50:59 +00:00
..
blue	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00