Added implementation of static method DatabaseUtils.appendEscapedSQLString with test coverage
Check for null before logging in ShadowCanvas. (src is allowed to be null)
modify startService to return ComponentName of given intent so that user can stop service by using return value from startService
Moved exclusion of org.easytesting:festutil

to dependency tag for org.easytesting:fest-assert-core
Implemented numerical support for ContentValues.getAsBoolean()

Copied existing Android functionality for getAsBoolean for Number values. Zero is false and anything else is true. Added unit tests to back this up as well as for String and Boolean values.
Added implementation for setAuthToken and peekAuthToken methods
AccountManager sould not set auth tokens for noo-existant accounts
Added implementation of SQLiteDatabase.isDbLockedByCurrentThread() to the ShadowSQLiteDatabase.
Revert "Moved exclusion of org.easytesting:festutil"

This reverts commit 588bd561ebf740ce9edfb3f4809d33048baffa2c.
Added unit tests that verify both the new shadow implementation of SQLiteDatabase.isDbLockedByCurrentThread() and the existing ShadowSQLiteDatabase.lock() and .unlock() methods.
Merge branch 'master' of git://github.com/cybergeek94/robolectric into cybergeek94-master

* 'master' of git://github.com/cybergeek94/robolectric:
  Added unit tests that verify both the new shadow implementation of SQLiteDatabase.isDbLockedByCurrentThread() and the existing ShadowSQLiteDatabase.lock() and .unlock() methods.
  Revert "Moved exclusion of org.easytesting:festutil"
  Added implementation of SQLiteDatabase.isDbLockedByCurrentThread() to the ShadowSQLiteDatabase.
  Moved exclusion of org.easytesting:festutil

Conflicts:
	src/main/java/org/robolectric/shadows/ShadowSQLiteDatabase.java
	src/test/java/org/robolectric/shadows/SQLiteDatabaseTest.java
Merge branch 'getAsBoolean_withNumbers' of git://github.com/jferlisi/robolectric into jferlisi-getAsBoolean_withNumbers

* 'getAsBoolean_withNumbers' of git://github.com/jferlisi/robolectric:
  Implemented numerical support for ContentValues.getAsBoolean()

Conflicts:
	src/main/java/org/robolectric/shadows/ShadowContentValues.java
	src/test/java/org/robolectric/shadows/ContentValuesTest.java
Merge branch 'master' of git://github.com/ravishrathod/robolectric into ravishrathod-master

* 'master' of git://github.com/ravishrathod/robolectric:
  AccountManager sould not set auth tokens for noo-existant accounts
  Added implementation for setAuthToken and peekAuthToken methods

Conflicts:
	src/main/java/org/robolectric/shadows/ShadowAccountManager.java
Oops, tests were flaky, fixed.
Merge branch 'bug_shadow_canvas' of git://github.com/theelfismike/robolectric into theelfismike-bug_shadow_canvas

* 'bug_shadow_canvas' of git://github.com/theelfismike/robolectric:
  Check for null before logging in ShadowCanvas. (src is allowed to be null)

Conflicts:
	src/main/java/com/xtremelabs/robolectric/shadows/ShadowCanvas.java
Merge branch 'databaseutils_branch' of git://github.com/blundell/robolectric into blundell-databaseutils_branch

* 'databaseutils_branch' of git://github.com/blundell/robolectric:
  Added implementation of static method DatabaseUtils.appendEscapedSQLString with test coverage

Conflicts:
	src/main/java/com/xtremelabs/robolectric/shadows/ShadowDatabaseUtils.java
	src/test/java/com/xtremelabs/robolectric/shadows/DatabaseUtilsTest.java
The robolectric.logging property wasn't working, fixed. Fixes 559.
Improve ShadowIntent and test a little.
[maven-release-plugin] prepare release robolectric-2.1
[maven-release-plugin] prepare for next development iteration