In scribe.thrift definition, place generated Java code into package scribe.thrift so that it can be referenced from other Java classes in a named package.
Merge branch 'master' of http://github.com/facebook/scribe

Conflicts:

	if/scribe.thrift
Merge branch 'develop_os' of http://github.com/facebook/scribe

Conflicts:

	if/scribe.thrift
Initialized to use tito.
Automatic commit of package [scribe] release [2.2-1].