[cinnamon/f19: 2/2] Merge branch 'master' into f19

[leigh123linux]

commit 023d8529c167aab02d293b9a520173618386e048
Merge: 1ff7909 bb6f819
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Sep 24 21:48:38 2013 +0100

    Merge branch 'master' into f19

 bluetooth.patch |   11 +++++++++++
 cinnamon.spec   |   14 +++++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---