Update drbd patch for riak techpreview
Revert "Add iptables-preload example to CC package"

This reverts commit 78bec46aa4d8dbdbe38d940219e6506db2c59041.
Add object storage registration tools
EUCA-7667 Add eucalyptus-backup-restore

Conflicts:
	eucalyptus.spec
EUCA-7667 Add eucalyptus-backup-restore script
Merge branch 'testing' of https://github.com/eucalyptus/eucalyptus-rpmspec into riak-techpreview

Conflicts:
	eucalyptus.spec
Add osg subpackage
Update java requires and build requires for RHEL 6.5 support
Merge remote-tracking branch 'origin/riak-techpreview' into testing

Conflicts:
	eucalyptus.spec