Merge branch 'l2x0' of rmk tree into prima2-l2x0
commit1e11bec9b09a28f81dd3173fec6b1c6c56b5e299
authorBarry Song <Barry.Song@csr.com>
Mon, 24 Oct 2011 09:40:40 +0000 (24 02:40 -0700)
committerBarry Song <Barry.Song@csr.com>
Mon, 24 Oct 2011 09:45:43 +0000 (24 02:45 -0700)
treecddb92f82bda3a5f362bb6d9f775d25dd1205e6b
parent2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb
parent91c2ebb90b1890abc648ba9dec5608cbc97e1cb9
Merge branch 'l2x0' of rmk tree into prima2-l2x0