[orage/el6: 15/15] Merge from master - 4.8.1

[Orion Poplawski]

commit faa586265eb80624cea468155d6f60f5b56855f7
Merge: 76d00d7 274ee2e
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu May 19 15:33:11 2011 -0600

    Merge from master - 4.8.1

 .gitignore               |    6 ++
 orage-4.6.1-dsofix.patch |   36 +++++++++++++
 orage.spec               |  131 +++++++++++++++++++++++++++++++++-------------
 sources                  |    4 +-
 4 files changed, 140 insertions(+), 37 deletions(-)
---