Merge remote-tracking branch 'origin/containers' into api_changes
authorJoão Abecasis <joao.abecasis@nokia.com>
Thu, 8 Mar 2012 13:58:00 +0000 (14:58 +0100)
committerJoão Abecasis <joao.abecasis@nokia.com>
Thu, 8 Mar 2012 13:58:12 +0000 (14:58 +0100)
commit08a993526eb1d98e0e22c6d4ae08d0cf2a587e49
tree81a81f4a5dd920b71147aecbd62c3c142f684401
parentc614bf25fef7e5a0e0fc7d74980f48a471b4406f
parent8141e34280a92088a527e0935765ad8ba8e92be8
Merge remote-tracking branch 'origin/containers' into api_changes

Change-Id: Ib8427caca38a14c040850bf45346f3213ffd04b3