commit b2dae7d5f0930bc99602beda344cedc5ecbbb241 Merge: 9c2e13d... 3ff1765... Author: Dave Riches dcr226@fedorapeople.org Date: Thu Dec 23 08:58:17 2010 +0000

Merge branch 'development'

multiboot-media-creator | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) ---