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

[Peter Robinson]

commit 8a96965b97655fbad28d720d8d29d4853f29bc0d
Merge: 5af4ed7 ab1ed18
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Sep 22 17:23:56 2011 +0100

    Merge branch 'master' into f16

 emerillon.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---