[rubygem-declarative_authorization/f15: 3/3] Merge branch 'master' into f15

[Darryl L. Pierce]

commit a990ef0c62fe84a83b3f8b0ccb31ab34ee8b1b2c
Merge: 84e4f17 8f83da4
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Thu Jul 21 09:31:54 2011 -0400

    Merge branch 'master' into f15
    
    Conflicts:
    	rubygem-declarative_authorization.spec
    
    This will hopefully get the branches back in sync.

 rubygem-declarative_authorization.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---