[ember-media/f16: 2/2] Merge branch 'master' into f16

[Bruno Wolff III]

commit e7390da7da819604bdacc6c9c4c16ac8a5e0bb30
Merge: e321304 ef3e748
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Wed Jan 18 08:04:51 2012 -0600

    Merge branch 'master' into f16

 ember-media.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---