Merge branch 'lab'
authorLMH <lmh.0013@gmail.com>
Tue, 31 Jan 2012 23:51:31 +0000 (13:51 -1000)
committerLMH <lmh.0013@gmail.com>
Tue, 31 Jan 2012 23:51:31 +0000 (13:51 -1000)

Trivial merge