[ostree/f19: 3/3] Merge branch 'master' into f19

[Colin Walters]

commit 2d28e30a08410b90d9ef72ac4cbaa1d03c89991c
Merge: 26d6df2 2091112
Author: Colin Walters <walters at verbum.org>
Date:   Tue Oct 15 17:57:34 2013 -0400

    Merge branch 'master' into f19
    
    Conflicts:
    	ostree.spec

 .gitignore  |    1 +
 ostree.spec |   45 ++++++++++++++++++++++++++-------------------
 sources     |    2 +-
 3 files changed, 28 insertions(+), 20 deletions(-)
---