a
Merge branch 'test'

Conflicts:
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/client/StockPrice.class
	war/WEB-INF/classes/com/google/gwt/sample/stockwatcher/server/StockPriceServiceImpl.class
Resolved merge