[osmo/f16: 2/2] Merge commit 'a857b654de7c81597a5cdfa72b9dd2ce5c692164' into f16

[Adam Williamson]

commit 03fdc226a21f97fcbe61b735ed549ac3a79b9a18
Merge: 4d31ea4 a857b65
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Aug 15 20:14:12 2011 -0700

    Merge commit 'a857b654de7c81597a5cdfa72b9dd2ce5c692164' into f16

 .gitignore                        |    1 +
 osmo-0.2.10-configure.patch       |   15 +++++++++++
 osmo-0.2.10-libnotify-0.7.0.patch |   46 ----------------------------------
 osmo-0.2.8-configure.patch        |   20 ---------------
 osmo.spec                         |   49 +++++++++++++++++++++++++-----------
 sources                           |    2 +-
 6 files changed, 51 insertions(+), 82 deletions(-)
---