[snappy/f15: 2/2] Merge branch 'master' into f15

[Nathaniel McCallum]

commit 0d89c10867aca28405bbfc411080d1b08b529d54
Merge: 68001b8 97345d9
Author: Nathaniel McCallum <nathaniel at themccallums.org>
Date:   Tue Jan 17 12:24:37 2012 -0500

    Merge branch 'master' into f15

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