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)
Change-Id: Ib8427caca38a14c040850bf45346f3213ffd04b3


Trivial merge