Merge branch 'mikko' into 2.0alpha-wayland
authorGraydon, Tracy <tracy.graydon@intel.com>
Thu, 7 Feb 2013 21:39:03 +0000 (13:39 -0800)
committerGraydon, Tracy <tracy.graydon@intel.com>
Thu, 7 Feb 2013 21:39:03 +0000 (13:39 -0800)
commit4bdb103b94297d22d434efe1ab6d135d4bbbd076
tree1285f741f8ecb3742bd6348d8635cdc35d78966f
parentae3d6ec66434bf4923e32d7b515146e4183dd7a0
parent092bfadd84247702c76b7e0c9cc78c91f38af8ff
Merge branch 'mikko' into 2.0alpha-wayland