Merge remote-tracking branch 'mneumann/f-serialize'

diff --cc src/libstd/ebml.rs
Simple merge

diff --cc src/libstd/json.rs
Simple merge

diff --cc src/libstd/prettyprint.rs
Simple merge

diff --cc src/libstd/serialize.rs
Simple merge

diff --cc src/libsyntax/ext/auto_encode.rs
Simple merge