Merge of branch dev-149441 to fedora-rest/trunk
Authored by: bbranan 2008-06-30
Parent: [r7385]
Child: [r7387]