Merge branch 'mr/requirements'
Authored by: Mark Ramm 2010-07-08
Parent(s): [621732][c5ad27]
Child(ren): [c484e9]