Merge branch 'genete_keyframe_list' into genete_master
authorCarlos Lopez <carlos@pcnuevo.(none)>
Mon, 27 Jul 2009 15:03:54 +0000 (17:03 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Mon, 27 Jul 2009 15:03:54 +0000 (17:03 +0200)

Trivial merge