Merge remote branch 'gerrit/api_changes' into merge-master
authorMatthew Vogt <matthew.vogt@nokia.com>
Mon, 5 Mar 2012 03:20:58 +0000 (13:20 +1000)
committerMatthew Vogt <matthew.vogt@nokia.com>
Mon, 5 Mar 2012 03:21:54 +0000 (13:21 +1000)
Change-Id: I9c54ff2a8aadb2bf95667eb3cf0a48f8291ce927


Trivial merge