Merge branch 'test'
authorAustin Yuan <shengquan.yuan@intel.com>
Mon, 24 Aug 2009 16:35:05 +0000 (00:35 +0800)
committerAustin Yuan <shengquan.yuan@intel.com>
Mon, 24 Aug 2009 16:35:05 +0000 (00:35 +0800)
commit19ba8deb5073631bfbfbd45cb7b9beaeb9527935
tree3894fba3ccd60e44f8c5ec3e871ed70c48eb9f34
parent59e9e255d32f67b61ee84be34f79fd7d1b03dc54
parent94ad3fdc5449b7c743621a25b805774bd914b16f
Merge branch 'test'