[snappy/f15: 5/5] merge with master

[Martin Gieseking]

commit 68001b8e973d1a983ff806c9ccbdda9daac254ce
Merge: dcbede8 f01a134
Author: Martin Gieseking <martin.gieseking at uos.de>
Date:   Fri Sep 16 11:24:46 2011 +0200

    merge with master

 .gitignore  |    1 +
 snappy.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---