[MySQL-zrm/el6: 8/8] Merge from master - 2.2.0

[Orion Poplawski]

commit 36d04f958015c0a0b7a6b47fbcb849547e969cb0
Merge: e1902f7 56f0c6b
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed May 18 16:57:15 2011 -0600

    Merge from master - 2.2.0

 .gitignore     |    1 +
 MySQL-zrm.spec |   16 ++++++++++++----
 sources        |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---