alexsmirnov
committed
248
on 01 Dec 08
merge code from the portlet2.0 branch