[marble/f19: 15/15] Merge branch 'master' into f19

[Rex Dieter]

commit ec18194745ec42f33227149eecaf66f1bac5153a
Merge: d996c35 0037d71
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 09:29:56 2013 -0500

    Merge branch 'master' into f19

 .gitignore                          |    7 ++---
 marble-4.10.90-qextserialport.patch |   12 ++++++++
 marble.spec                         |   51 ++++++++++++++++++++++++++++++++++-
 sources                             |    2 +-
 4 files changed, 66 insertions(+), 6 deletions(-)
---