Just trying to break things
Merge branch 'another' - conflicts resolved

Conflicts:
	src/com/google/gwt/sample/stockwatcher/client/StockWatcher.java