From fa7f985d082c9fde04ceffa990c775658d422bff Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 16 Nov 2012 18:49:10 -0800
Subject: [PATCH] Update submodules and set default text size to 16

---
 src/rust-css            | 2 +-
 src/rust-netsurfcss     | 2 +-
 src/servo/layout/box.rs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rust-css b/src/rust-css
index 3db75df69b2..2e0a6bade87 160000
--- a/src/rust-css
+++ b/src/rust-css
@@ -1 +1 @@
-Subproject commit 3db75df69b203ea848ee71a7e2dc15b476bf7290
+Subproject commit 2e0a6bade87781ee740f60e3285bcbb1b4145b96
diff --git a/src/rust-netsurfcss b/src/rust-netsurfcss
index e7c1d74d90a..ba44bce5774 160000
--- a/src/rust-netsurfcss
+++ b/src/rust-netsurfcss
@@ -1 +1 @@
-Subproject commit e7c1d74d90a359395187d10364b7238ecca108eb
+Subproject commit ba44bce57740bb9d0410946f82d4f280db9fe893
diff --git a/src/servo/layout/box.rs b/src/servo/layout/box.rs
index 51419dc2a54..8554a4c0410 100644
--- a/src/servo/layout/box.rs
+++ b/src/servo/layout/box.rs
@@ -539,9 +539,9 @@ impl RenderBox : RenderBoxMethods {
 
             let font_size = match my_style.font_size() {
                 CSSFontSizeLength(Px(l)) |
-                CSSFontSizeLength(Pt(l)) |
+                CSSFontSizeLength(Pt(l)) => l,
                 CSSFontSizeLength(Em(l)) => l,
-                _ => 12f
+                _ => 16f
             };
             debug!("(font style) font size: `%f`", font_size);