Merge branch 'work/fifomerge'
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 25 Jan 2012 11:50:34 +0000 (13:50 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 25 Jan 2012 11:50:34 +0000 (13:50 +0200)

Trivial merge