Merge remote-tracking branch 'gerrit/master' into containers
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 9 Dec 2011 16:10:21 +0000 (17:10 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 9 Dec 2011 16:11:20 +0000 (17:11 +0100)
commit4714f86c54eb358ec431fb94d6b135b4cad2a7c7
treeead864148546b91c076f0852136680b816c7831a
parentd5d073f87434fbe0f80269e9948b644f5ced1faf
parentb986131c6d1243725134285dfc94581f80c00746
Merge remote-tracking branch 'gerrit/master' into containers

Change-Id: I01f94564c17d68872839be5396c24b661e53d571