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)
commitec97f1cf507963320aa06c59c3ff3baa2cafa6aa
treec351d55d5a606c81c72e481f846b9b9e2603c883
parent36bd7f616f37f5f60e59bce1f0d8970248d627de
parent0284817d6cd7e17afa8da26ee6e9199100754446
Merge remote branch 'gerrit/api_changes' into merge-master

Change-Id: I9c54ff2a8aadb2bf95667eb3cf0a48f8291ce927