Merge branch 'proposed'
authorLuca Filipozzi <lfilipoz@emyr.net>
Mon, 27 Jan 2014 04:25:46 +0000 (04:25 +0000)
committerLuca Filipozzi <lfilipoz@emyr.net>
Mon, 27 Jan 2014 04:26:01 +0000 (04:26 +0000)
Signed-off-by: Luca Filipozzi <lfilipoz@emyr.net>

Trivial merge