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

[Bruno Wolff III]

commit a04b09903cdef9f677efd9276ebb5bf630bc611f
Merge: 3f3da5e b4d4a47
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Jan 23 23:56:31 2012 -0600

    Merge branch 'master' into f16

 ember-gcc47.patch |   72 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 ember.spec        |    7 ++++-
 2 files changed, 78 insertions(+), 1 deletions(-)
---